device-mapper should start after modules and LVM by default. If you need to change this, edit conf.d/device-mapper. before checkroot -> before checkfs

Package-Manager: portage-2.1.3.12

6 files changed, 38 insertions, 23 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 67e46ffd4b20..a9de8cbbae22 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,15 @@
 # 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.86 2007/10/04 14:30:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.87 2007/10/08 21:18:36 cardoe Exp $
+
+*device-mapper-1.02.22-r3 (08 Oct 2007)
+
+  08 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
+  -files/device-mapper.rc-1.02.22-r2, +files/device-mapper.conf-1.02.22-r3,
+  +files/device-mapper.rc-1.02.22-r3, -device-mapper-1.02.22-r2.ebuild,
+  +device-mapper-1.02.22-r3.ebuild:
+  device-mapper should start after modules and LVM by default. If you need to
+  change this, edit conf.d/device-mapper. before checkroot -> before checkfs
 
 *device-mapper-1.02.22-r2 (04 Oct 2007)
 
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 5625fcd2eb1d..84035533d461 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -17,14 +17,18 @@ AUX device-mapper-1.02.22-export-format.diff 11410 RMD160 dac695aa0eef0adfa1dafe
 MD5 760a01d7927c1def3db115e16572aaed files/device-mapper-1.02.22-export-format.diff 11410
 RMD160 dac695aa0eef0adfa1dafea428a8c7412d96ebee files/device-mapper-1.02.22-export-format.diff 11410
 SHA256 e7ded5533a0a6409be967e259ecea39395e783686431567112744743d3b9e553 files/device-mapper-1.02.22-export-format.diff 11410
+AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
+MD5 0e06961de6c24824f6fb37f8f45ce925 files/device-mapper.conf-1.02.22-r3 15
+RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a files/device-mapper.conf-1.02.22-r3 15
+SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22 files/device-mapper.conf-1.02.22-r3 15
 AUX device-mapper.rc 607 RMD160 1f794b58d5f137b4f84d1fd5e672802726b16adc SHA1 f72e076c7205dfd836f6d0621fe759b1533987c9 SHA256 8f2e3837ec52c24f07fffbbda53f8141f2dc634aa58cdc6c32edf841bbfa76ae
 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-1.02.22-r2 598 RMD160 11d970f024759912cf1286fc9b00c948ca14425f SHA1 ff86c9d8f58189b92d5f51934fe0531af1c8e734 SHA256 4dbc1515aab84c6436453009ba510ca262eca0b108ed429a2aadb94b6c8aab18
-MD5 5269ac033a82ebd64f22374677cd57b7 files/device-mapper.rc-1.02.22-r2 598
-RMD160 11d970f024759912cf1286fc9b00c948ca14425f files/device-mapper.rc-1.02.22-r2 598
-SHA256 4dbc1515aab84c6436453009ba510ca262eca0b108ed429a2aadb94b6c8aab18 files/device-mapper.rc-1.02.22-r2 598
+AUX device-mapper.rc-1.02.22-r3 596 RMD160 b25b1e3754b6bce8328969d34e34df40e40d3c92 SHA1 8009d7f073bd6de8057ac371a1c046f777a0bc41 SHA256 f1bf91ec304a50994330aef63a1cb4770915d3035347aedfb72ace31c0c14424
+MD5 b4d12e084ef12e6afefc4868517eb6ff files/device-mapper.rc-1.02.22-r3 596
+RMD160 b25b1e3754b6bce8328969d34e34df40e40d3c92 files/device-mapper.rc-1.02.22-r3 596
+SHA256 f1bf91ec304a50994330aef63a1cb4770915d3035347aedfb72ace31c0c14424 files/device-mapper.rc-1.02.22-r3 596
 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
@@ -71,18 +75,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 2039 RMD160 452860280538c9d6dd353eff4dff7867ca4555de SHA1 515ba173593df4c343de33ae6e1d99837d49d125 SHA256 7afa984b951c4c39445545d6e92ff9b0f125163e84c78aade8c79cc11436f3bc
-MD5 4474901c8ebbbd099470489a825dd9a8 device-mapper-1.02.22-r2.ebuild 2039
-RMD160 452860280538c9d6dd353eff4dff7867ca4555de device-mapper-1.02.22-r2.ebuild 2039
-SHA256 7afa984b951c4c39445545d6e92ff9b0f125163e84c78aade8c79cc11436f3bc device-mapper-1.02.22-r2.ebuild 2039
+EBUILD device-mapper-1.02.22-r3.ebuild 2114 RMD160 05edc7bc37b684d4209003a007dc3834c6398a45 SHA1 66110860afdbe75d056884dd6d84c4a230039530 SHA256 7de6bac16999317dd9d81a9ae0935aaa0abbeaac433a903cdd4512c6dc1055c8
+MD5 d31b7f9b075b8a186df1565642ede1ae device-mapper-1.02.22-r3.ebuild 2114
+RMD160 05edc7bc37b684d4209003a007dc3834c6398a45 device-mapper-1.02.22-r3.ebuild 2114
+SHA256 7de6bac16999317dd9d81a9ae0935aaa0abbeaac433a903cdd4512c6dc1055c8 device-mapper-1.02.22-r3.ebuild 2114
 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 15572 RMD160 f09f5a5d1f3a09fd97031dd696a895f7a21f032e SHA1 3de7edd93a8493e79712ed0473040ffeeab18a30 SHA256 37acdc1cc54399124871fe216ce1bb6ad8095debc97127b28e21d64a403467da
-MD5 546fe9a0b4034c1825c6c2e0c27508d1 ChangeLog 15572
-RMD160 f09f5a5d1f3a09fd97031dd696a895f7a21f032e ChangeLog 15572
-SHA256 37acdc1cc54399124871fe216ce1bb6ad8095debc97127b28e21d64a403467da ChangeLog 15572
+MISC ChangeLog 16003 RMD160 0b218f728d6a183ca15d2d1067a51f4c806fdccf SHA1 f230ab47ed961770fae7e6b6e5decdf1acfbeb73 SHA256 cdfaf263d55f5eb69f329108c303038a8dfa683ec079d51882404db2cce206b0
+MD5 1957f14c34c62487c918cf5bf27a96b6 ChangeLog 16003
+RMD160 0b218f728d6a183ca15d2d1067a51f4c806fdccf ChangeLog 16003
+SHA256 cdfaf263d55f5eb69f329108c303038a8dfa683ec079d51882404db2cce206b0 ChangeLog 16003
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
 MD5 80dc99dec1aed7022edd3fe784b02759 metadata.xml 300
 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd metadata.xml 300
@@ -114,13 +118,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
+MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r3 256
+RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r3 256
+SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r3 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHBPkFoeSe8B0zEfwRArbdAJ9bybBsVxoT4BIouSl8Krh6SZ8KuACdEsX4
-UepJwX7xI43JQerlT+MfgkE=
-=OTEz
+iD8DBQFHCp6/oeSe8B0zEfwRAul/AKCDtFDuMIRGoxTd/S2wIieR2CLMhwCfa40X
+sKIp7GNzQkKj1g2lvhtw+os=
+=8GlC
 -----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-r3.ebuild
index 885f091e5dc4..fa850c842171 100644
--- a/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild
+++ b/sys-fs/device-mapper/device-mapper-1.02.22-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/10/04 14:30:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.22-r3.ebuild,v 1.1 2007/10/08 21:18:36 cardoe Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -42,7 +42,8 @@ src_install() {
 	insinto /lib/rcscripts/addons
 	doins "${FILESDIR}"/dm-start.sh
 
-	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r2 device-mapper || die
+	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
 
 	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
 	dolib.a dmeventd/libdevmapper-event.a || die
diff --git a/sys-fs/device-mapper/files/device-mapper.conf-1.02.22-r3 b/sys-fs/device-mapper/files/device-mapper.conf-1.02.22-r3
new file mode 100644
index 000000000000..bc7a25158635
--- /dev/null
+++ b/sys-fs/device-mapper/files/device-mapper.conf-1.02.22-r3
@@ -0,0 +1 @@
+RC_AFTER="lvm"
diff --git a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r2 b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
index dd7d7ccdb11e..76bcc162fbef 100644
--- a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r2
+++ b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
@@ -1,13 +1,13 @@
 #!/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-1.02.22-r2,v 1.1 2007/10/04 14:30:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3,v 1.1 2007/10/08 21:18:37 cardoe Exp $
 
 depend() {
 	if [ -e /lib/librc.so ]; then
 		# on baselayout-1 this causes
 		# a dependency loop with checkroot (before *)
-		before checkroot
+		before checkfs
 	fi
 }
 
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-r3
index 9b8f6a284ce3..9b8f6a284ce3 100644
--- 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-r3