Bug #318051: In certain situations, LVM needs dmeventd to start before it, so ensure this enforced by the init system.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 19 insertions, 11 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 2d4c1721081f..8bdf5cc270ec 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.206 2010/05/01 21:21:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.207 2010/05/01 21:26:33 robbat2 Exp $
+
+  01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  files/device-mapper.rc-1.02.51-r2, files/clvmd.rc-2.02.39,
+  files/lvm.rc-2.02.51-r2:
+  Bug #318051: In certain situations, LVM needs dmeventd to start before it,
+  so ensure this enforced by the init system.
 
 *lvm2-2.02.64 (01 May 2010)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 982d7d1e3968..787afb841bb9 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -4,10 +4,10 @@ AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8e
 AUX 64-device-mapper.rules-2.02.56-r3 1100 RMD160 0c43bc0b970cf755cd40c60c0d3c039fa7c13e4f SHA1 efe4ef6b8e9696c6999db4920fc03d692fa8ecaf SHA256 47b8b713ca809dcd73255c445ce5ef5ec6ba028f7ea685be3a7ba0c36bf38f1c
 AUX clvmd.confd-2.02.39 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a
 AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519
-AUX clvmd.rc-2.02.39 3678 RMD160 50b5ffbf50486a4ca5640344f72e8814c47878db SHA1 7e9e933212e716869e4ba58880bdc526f577cd9b SHA256 9e5ee139b04fd7a691759b84e4d2986752259a4670f1c2f16acb013bf5713b44
+AUX clvmd.rc-2.02.39 3682 RMD160 891e8f770a5566fc9102cc02db8ff81174791aca SHA1 411670cedc62709e00ff2c0b5d883433f02ef9df SHA256 d60d88202589899e0856ac819cef1599103b7d5dc412afe5e0e38fc224aa79a8
 AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
 AUX device-mapper.rc-1.02.22-r3 618 RMD160 c6d4c405ce381cc4c86c8e838ba25ddb64f4ac75 SHA1 92486f5a6f77b220e3d11589f12c458eaeeda0b1 SHA256 c682cfa6da469eed055bf6e6a88e2d48ecfa12be406cd857965ef08bb1ecdaf8
-AUX device-mapper.rc-1.02.51-r2 682 RMD160 bb8c80342447a30d29e79f890d1e0d4b56113cbf SHA1 834c89246dd0cf0fb70c09585106c14c71e730a1 SHA256 a5f635565aca8b0e4ebb02d987a8b75a85c1fe8068832ec88abbeb6afba8987f
+AUX device-mapper.rc-1.02.51-r2 701 RMD160 cebd843b44b7d03acc113fbaa0af30f21d0f5de6 SHA1 f563adc35777030ec50b29005a9285a90e86a904 SHA256 dfdff0739dad521087ffa20f06e274bbc666e0ab85779621c360c04728e3cf58
 AUX dm-start.sh 2114 RMD160 96a6b824e22d5c04f2710f98cda5361bde6a265c SHA1 b18c79802ab8bac9befe4a32cce6fe13beb3134c SHA256 c064c3e2a1d128a6326b539a675f1a6cf88b75f5526222e232d53ea1468a9bcf
 AUX dmtab 416 RMD160 d5da257f9ac48af9e831dbd6591e608577d87717 SHA1 f37631cb644b8a242a0426375b1b6acee0bde399 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8bd7b5
 AUX lvm.conf-2.02.33.patch 3136 RMD160 c0292c39db064f0a4151ffccdc441be2fa78f8cf SHA1 8dbcbf66a841cc8acd889e174095df9932813a3e SHA256 63a8c21186f47979cb628970dca12df2a9f319745488a4d8a1e01f238a7fc711
@@ -17,7 +17,7 @@ AUX lvm.conf-2.02.51.patch 2690 RMD160 1aa597d10ee928d4c209fe5beb01dd1ab4b99b35
 AUX lvm.conf-2.02.56.patch 1697 RMD160 159030156098e4aa5bc141a5a04f9ba60f5b430c SHA1 d37ee83b1c74043d413b99d52bf3c652cebc2eb3 SHA256 76dd9c5932b4c8c0d51eeb357e91c5e2af87dd180e3ca76940e3a7ad4de5f2e6
 AUX lvm.confd-2.02.28-r2 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA1 e8186ebb91d12247d0865285dc62346d1cbc207a SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844
 AUX lvm.rc-2.02.28-r2 661 RMD160 3b267ab500785de249101548a15792708d3adc55 SHA1 b014a0d4344c58c963db20cefeb726dfd66d1b1a SHA256 962d9e8baa06a617671701d21f8a2849b45ab9baa6684b2e99b2b03192c9e66a
-AUX lvm.rc-2.02.51-r2 759 RMD160 23d931309ed71df30f17f0656c4d3ea5fd3f5564 SHA1 bd4a7e91e900715f5046669a7622925ad1556bc8 SHA256 d1ed3ffd62aca317608e15f25b6d4cc0fee61a880d61f7933aa9d5c46ce551fd
+AUX lvm.rc-2.02.51-r2 792 RMD160 9a5bb96606d20a420b7ff94e6de2b140d0a5022d SHA1 302111a801f1301f387db52180ec2f876d08898f SHA256 b883e8ae1d3b9d8a0bdf85b009125e9408ee6d22a159b2e4c340fce455d5fd9f
 AUX lvm2-2.02.45-device-mapper-export-format.patch 10323 RMD160 d36a0d80add1ea812cc7f4828aa4a71b0accff78 SHA1 29e5b230ce7562dee59cd61068a8faa6684518fe SHA256 563103fc0fa4c2a35a9adf94332f0502f36fd85e408916b7be7e3503121cc1d0
 AUX lvm2-2.02.45-dmeventd.patch 457 RMD160 280708918c33db4614d825e6c9f1909aa3f52a62 SHA1 3c3e17919d369457947944d428508a94049d3787 SHA256 1b275c4321c20227af6a758f962dfd2f14d2f25a65f9b74e9d43f93d3a6bf37e
 AUX lvm2-2.02.48-as-needed.patch 7894 RMD160 d44bc76d5f83249af6401c81d7a21082022446c8 SHA1 07b850f41425cd1505259d54de3daf9cdb3cf259 SHA256 8e23f75f9e51f1c94bcba4a4a87534146baa6e992f38f86552e8688091cfbc09
@@ -84,5 +84,5 @@ EBUILD lvm2-2.02.56.ebuild 6486 RMD160 3a14e38c19adf2f87e03cf092cb921817e43a029
 EBUILD lvm2-2.02.63-r1.ebuild 7537 RMD160 7d53615e3e7dc881c46bce8cc7561b7c13fe8694 SHA1 0c040cce770d5f3a01c5ab79f3e85fb388acad25 SHA256 7091615726f6c1f4e5b475781546f502fd49d0ca398833458c4be9e864c90d7f
 EBUILD lvm2-2.02.63-r2.ebuild 7675 RMD160 392d338b555acb6b0357020e5017ea64b123981e SHA1 e0468b7e5e81603dcf1c965dbf734c467c083288 SHA256 d0cf75b52d08f7fa3bd2bbe38ea76ee9ea85dc49be354e8bfbec029e5c594ad5
 EBUILD lvm2-2.02.64.ebuild 7893 RMD160 d7721533361b006c0ebe8e98413609e8dbfe4b7a SHA1 a4ac4ef4c32e289856123ef367a36d8dfa72e8fb SHA256 c988859c187f8718f54f38b66387e3ab6f7bf549991c2e3ff253eb860f63b9ff
-MISC ChangeLog 36098 RMD160 3f82329e324c8cf28934c73018a36714b499b5f0 SHA1 c5cf178eb6b78ef96297614ff48a31e256b078ef SHA256 f19864325000fffbbd7b1eac0c3a95a97a284f51ed35b17ad4bdc11f9d552781
+MISC ChangeLog 36363 RMD160 e570a6336a4211825aec632b8570961b355118a3 SHA1 0fb360757e6d7845e41b0acc6123ca0bf50a3aad SHA256 89a7eab568f34d9f02b47a2a88bf6ae946943c1b584d379d694c439eafd0eddc
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
index 6bff777132b5..764aeabc9603 100755
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.39
+++ b/sys-fs/lvm2/files/clvmd.rc-2.02.39
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.1 2009/05/19 00:08:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.2 2010/05/01 21:26:32 robbat2 Exp $
 
 [ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
 
@@ -14,8 +14,7 @@ VGDISPLAY="/sbin/vgdisplay"
 CLVMD_PIDFILE="/var/run/clvmd.pid"
 
 depend() {
-	use dns logger
-	use net
+	use net dns logger dmeventd
 	need cman
 }
 
diff --git a/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2 b/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
index 768549d3a67a..9eb3d3ccb7a0 100644
--- a/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
+++ b/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
@@ -1,15 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v 1.1 2009/10/27 15:34:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v 1.2 2010/05/01 21:26:33 robbat2 Exp $
 
 depend() {
 	# necessary for services when using baselayout-2
 	# but conflict for baselayout-1
 	if [ -e /etc/init.d/root ] ; then
-		after modules
 		before checkfs fsck
+		after modules
 	fi
+	after dmeventd
 }
 
 start() {
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.51-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
index f05b22c59b10..ca2084eeb64d 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.51-r2
@@ -1,7 +1,7 @@
 #!/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/lvm2/files/lvm.rc-2.02.51-r2,v 1.1 2009/10/27 15:34:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.51-r2,v 1.2 2010/05/01 21:26:33 robbat2 Exp $
 
 depend() {
 	if [ -f /etc/init.d/sysfs ]; then
@@ -10,6 +10,8 @@ depend() {
 		before checkfs fsck
 		after modules device-mapper
 	fi
+	use dmeventd
+	after dmeventd
 }
 
 run_addon() {