fix baselayout-2 init script to use start_addon

Package-Manager: portage-2.1.3.11

5 files changed, 126 insertions, 5 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index fa2ecc9cf17b..133cda5db120 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.84 2007/10/02 09:38:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.85 2007/10/04 14:15:38 cardoe Exp $
+
+*device-mapper-1.02.22-r2 (04 Oct 2007)
+
+  04 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/device-mapper.rc-r1, +device-mapper-1.02.22-r2.ebuild:
+  fix baselayout-2 init script to use start_addon
 
   02 Oct 2007; Robin H. Johnson <robbat2@gentoo.org>
   device-mapper-1.02.22-r1.ebuild:
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index fdce44b3edee..ecd8f378f235 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.02.22-dmeventd.initd 547 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 SHA1 dcd11d182a3888f2efdbb535ee9f3bb5ebb4ee46 SHA256 6b55e8cac8f47ea7c00ef66ce078826628842b6d13bbebed875bec2188b5e675
 MD5 65052d21ee4a81086c0b35822c7e5259 files/1.02.22-dmeventd.initd 547
 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 files/1.02.22-dmeventd.initd 547
@@ -18,6 +21,10 @@ AUX device-mapper.rc 607 RMD160 1f794b58d5f137b4f84d1fd5e672802726b16adc SHA1 f7
 MD5 a215c687a34d701d64e599f795252160 files/device-mapper.rc 607
 RMD160 1f794b58d5f137b4f84d1fd5e672802726b16adc files/device-mapper.rc 607
 SHA256 8f2e3837ec52c24f07fffbbda53f8141f2dc634aa58cdc6c32edf841bbfa76ae files/device-mapper.rc 607
+AUX device-mapper.rc-r1 590 RMD160 7fd2673d6a44dd6dda576712a1b4d605cfd4ebd7 SHA1 a7a2dfff9c29045d5d2aa4514628b2fe6bbba025 SHA256 aac2a44820c930c33398513e65598075fe5dfd209995055c9dafd15711029bbc
+MD5 a1d754605a639c1020946ed3bc4cc4d6 files/device-mapper.rc-r1 590
+RMD160 7fd2673d6a44dd6dda576712a1b4d605cfd4ebd7 files/device-mapper.rc-r1 590
+SHA256 aac2a44820c930c33398513e65598075fe5dfd209995055c9dafd15711029bbc files/device-mapper.rc-r1 590
 AUX dm-start.sh 2124 RMD160 c545e6ffafba981baf60b0fae68492dc7fd98b19 SHA1 59afedd1813c9e28cc89c7baf58071706c1c0de7 SHA256 2de52be0dda02d5d93aa8746c372b01c570d5a8947c71a617b186b21a3e4b325
 MD5 594b666ba93a00cef86b6ed41300d64f files/dm-start.sh 2124
 RMD160 c545e6ffafba981baf60b0fae68492dc7fd98b19 files/dm-start.sh 2124
@@ -64,14 +71,18 @@ EBUILD device-mapper-1.02.22-r1.ebuild 2029 RMD160 f8f7a284100d366f700b5419c1065
 MD5 6f2b8a9df574ba2ebc16042c1570b2ab device-mapper-1.02.22-r1.ebuild 2029
 RMD160 f8f7a284100d366f700b5419c1065dee2e90d70e device-mapper-1.02.22-r1.ebuild 2029
 SHA256 0f383d1be0f8f2111aca9a32f7a01487779ec493f7d6b290a92cbfd56920369d device-mapper-1.02.22-r1.ebuild 2029
+EBUILD device-mapper-1.02.22-r2.ebuild 2031 RMD160 7cd2f7d2f0775600e0345fc4fcf65afbba55c5a2 SHA1 2df46d7c8b1dab0d0f053419163c775995aaf6e4 SHA256 854643f588b6c43f7737cd599a8b6d2923ba011fca9c56745f37295554032103
+MD5 dae61f7a942a6d2f85273cb014b88a74 device-mapper-1.02.22-r2.ebuild 2031
+RMD160 7cd2f7d2f0775600e0345fc4fcf65afbba55c5a2 device-mapper-1.02.22-r2.ebuild 2031
+SHA256 854643f588b6c43f7737cd599a8b6d2923ba011fca9c56745f37295554032103 device-mapper-1.02.22-r2.ebuild 2031
 EBUILD device-mapper-1.02.22.ebuild 1848 RMD160 098e47d914b5cb485bd902e7e5a55e2727c91394 SHA1 684b05c5beda0c88409138613dbd2638fafcc14d SHA256 532681352ee40387b55f48da1453a503cb30c259e08ea7ef36a35f080421b124
 MD5 e0373d8214e4cb960d57776a1b052e74 device-mapper-1.02.22.ebuild 1848
 RMD160 098e47d914b5cb485bd902e7e5a55e2727c91394 device-mapper-1.02.22.ebuild 1848
 SHA256 532681352ee40387b55f48da1453a503cb30c259e08ea7ef36a35f080421b124 device-mapper-1.02.22.ebuild 1848
-MISC ChangeLog 15359 RMD160 61c4ea65f3ad1552d5037c55123cbe55d0e0a49c SHA1 be563deae9a433c238e217b9fd739d15715ec5be SHA256 8a38abe37302d22b81e87427d4276b5dde9af85627d04a9f932f498a601ffc00
-MD5 439268a0b0099cf2501a789e3016ebf5 ChangeLog 15359
-RMD160 61c4ea65f3ad1552d5037c55123cbe55d0e0a49c ChangeLog 15359
-SHA256 8a38abe37302d22b81e87427d4276b5dde9af85627d04a9f932f498a601ffc00 ChangeLog 15359
+MISC ChangeLog 15564 RMD160 b4d8629437e0e3da2076905161974550b0048568 SHA1 fb651c0a5d5621d8a9e71901f808d0ca6baaf0f6 SHA256 58ff2379c3febda62baa48d3e741707985fac793af687c3b34852a9b50f8abee
+MD5 9e3c12e8e33fa8915cceaf685875d89c ChangeLog 15564
+RMD160 b4d8629437e0e3da2076905161974550b0048568 ChangeLog 15564
+SHA256 58ff2379c3febda62baa48d3e741707985fac793af687c3b34852a9b50f8abee ChangeLog 15564
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
 MD5 80dc99dec1aed7022edd3fe784b02759 metadata.xml 300
 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd metadata.xml 300
@@ -103,3 +114,13 @@ SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/di
 MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r1 256
 RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r1 256
 SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r1 256
+MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r2 256
+RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r2 256
+SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHBPWToeSe8B0zEfwRAtakAJ4uKrNKc3lDHBDBOoU2EB6AucvlewCcCBCl
+ePoOwI7CDK+t95jIdgNo84g=
+=t7ms
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild b/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild
new file mode 100644
index 000000000000..94a6e668a44c
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild,v 1.1 2007/10/04 14:15:38 cardoe Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/device-mapper-1.02.22-export-format.diff
+}
+
+src_compile() {
+	econf --sbindir=/sbin $(use_enable selinux) --enable-dmeventd || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	# move shared libs to /
+	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
+	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	newinitd "${FILESDIR}"/device-mapper.rc-r1 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	dolib.a dmeventd/libdevmapper-event.a || die
+	gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22 64-device-mapper.rules
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l="${ROOT}"/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+
+	elog "device-mapper volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add device-mapper boot"
+}
diff --git a/sys-fs/device-mapper/files/device-mapper.rc-r1 b/sys-fs/device-mapper/files/device-mapper.rc-r1
new file mode 100644
index 000000000000..d5693c43d273
--- /dev/null
+++ b/sys-fs/device-mapper/files/device-mapper.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-r1,v 1.1 2007/10/04 14:15:39 cardoe Exp $
+
+depend() {
+	if [ -e /lib/librc.so ]; then
+		# on baselayout-1 this causes
+		# a dependency loop with checkroot (before *)
+		before checkroot
+	fi
+}
+
+start() {
+	if [ ! -e /lib/librc.so ]; then
+		eerror "The ${SVCNAME} init script is written for baselayout-2"
+		eerror "Please do not use it with baselayout-1"
+		return 1
+	fi
+
+	start_addon dm	
+}
+
diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2
new file mode 100644
index 000000000000..9b8f6a284ce3
--- /dev/null
+++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2
@@ -0,0 +1,3 @@
+MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
+RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
+SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726