Stop using /lib/librc.so to detect openrc/baselayout2, and use a file installed by new openrc instead, fixes bug #253076.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-05718-g0556e82 x86_64
RepoMan-Options: --force

3 files changed, 11 insertions, 8 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 01e42fbac105..9cb56a512e8c 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.150 2009/01/17 22:44:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.151 2009/01/17 22:53:14 robbat2 Exp $
+
+  17 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/lvm.rc-2.02.28-r2:
+  Stop using /lib/librc.so to detect openrc/baselayout2, and use a file
+  installed by new openrc instead, fixes bug #253076.
 
   17 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
   files/lvm.rc-2.02.28-r2:
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cd087b7a2c85..b9b6a43607f4 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -2,7 +2,7 @@ AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA
 AUX lvm.conf-2.02.33.patch 3136 RMD160 c0292c39db064f0a4151ffccdc441be2fa78f8cf SHA1 8dbcbf66a841cc8acd889e174095df9932813a3e SHA256 63a8c21186f47979cb628970dca12df2a9f319745488a4d8a1e01f238a7fc711
 AUX lvm.conf-2.02.36.patch 3118 RMD160 b19039d550cd81d46f77d493cb6c5507a3fd66ee SHA1 dd4f4892c4b423348a764c1373ed81959ca0772b SHA256 85abba15c2dc52af9d518140e210abba852df83deb7740a19be3987a64f677f9
 AUX lvm.confd-2.02.28-r2 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA1 e8186ebb91d12247d0865285dc62346d1cbc207a SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844
-AUX lvm.rc-2.02.28-r2 653 RMD160 576c72628c399d576c7199227c0185cd6d10c984 SHA1 571ff1388bbf836d258f7d5eccc99852b9c5606f SHA256 e564e9266d726cb98b6d91ff60e1efcf9bf3c7e4c45a90e1e32cda710fcef164
+AUX lvm.rc-2.02.28-r2 661 RMD160 3b267ab500785de249101548a15792708d3adc55 SHA1 b014a0d4344c58c963db20cefeb726dfd66d1b1a SHA256 962d9e8baa06a617671701d21f8a2849b45ab9baa6684b2e99b2b03192c9e66a
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf316b02fb5f79bb6c0464cc3c1606704cec7b SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c
@@ -21,7 +21,5 @@ EBUILD lvm2-2.02.36.ebuild 4444 RMD160 4f822538a424c07480076d292229d2d5c0615fca
 EBUILD lvm2-2.02.37.ebuild 4571 RMD160 44146793c17835db157658ecf4a08929e3026ebd SHA1 a42e7447fcb94304c13363043dd34f7dbe95564b SHA256 43f9160c0d9fa581a341e0de622039023e320925791e4deb7e7fe2a81dcad676
 EBUILD lvm2-2.02.39.ebuild 4634 RMD160 d32fb9484de61863fac2f60bee87ab0c01c0d627 SHA1 a1f3e96f637fb59cf3542efa8c9b6a72596f7a6f SHA256 5add06014dc8aab7d7c4dc87c364f01039ab6e71d576c0409ebecda6938123fd
 EBUILD lvm2-2.02.42.ebuild 4634 RMD160 02f7eabf214bd3a3d186edc082ac4703c2eba70e SHA1 e889e96f0031badecdfe33e789ecec437ad91a28 SHA256 a2cb55a8475d29ea39117ccf390f1fd37bb910c68b2e88514205d5b5d947d59f
-MISC ChangeLog 23307 RMD160 0a32657a4cf5f3b5358706fb3da758503260e344 SHA1 13969c82f1e119a7a191a51d719fcb7fa108fadd SHA256 8b30bbadda55ed0aa54533444a1cf1aca7e7851cdd4c372bcd0b2d5b8cf812f7
-MISC lvm2-2.02.42.ebuild.orig 4713 RMD160 9e3ecd24c0eabdcd4b8d9738612a1f2e06f5665b SHA1 898b7a7f41c374f330a66866df4fd4e81e509c09 SHA256 5996cee773f48d09269317d650bcf4969361cdd8be1abb924526ea6d957b5b47
-MISC lvm2-2.02.42.ebuild.rej 697 RMD160 554cc6059190868e3ebe90877ca6abaea83ec7e3 SHA1 9b7c3be8145c100b6398831912730e02a2aed50e SHA256 db0b60d4a805d301e22f005b90a699fcf66fb8f90f6dc310d7b5bf609d322feb
+MISC ChangeLog 23514 RMD160 07a275a409b9de3003bd3e37162e1350a1199e66 SHA1 1d45f4ae101f21c925a1c3d87b8ec29e8f498a7a SHA256 ff77e9882d531fe2712ed978bc0231c30919f5d7c80839f50a377f646ef83588
 MISC metadata.xml 874 RMD160 8490f9b00d54a8c55c71ce68aa66c378f54dcc4f SHA1 920b9c9b36b372fc74041be454ba9efc021f6d61 SHA256 c1c0ed841c78a19b10d4dbe51e81be0ae89f24281d6f3322eff14b43d53714d3
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
index 2b9a71606d78..0d17437b245f 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
@@ -1,10 +1,10 @@
 #!/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.28-r2,v 1.3 2009/01/17 22:44:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r2,v 1.4 2009/01/17 22:53:15 robbat2 Exp $
 
 depend() {
-	if [ -e /lib/librc.so ]; then
+	if [ -f /etc/init.d/sysfs ]; then
 		# on baselayout-1 this causes
 		# dependency-cycles with checkroot (before *)
 		before checkfs fsck
@@ -13,7 +13,7 @@ depend() {
 }
 
 start() {
-	if [ ! -e /lib/librc.so ]; then
+	if [ ! -f /etc/init.d/sysfs ]; then
 		eerror "The $SVCNAME init-script is written for baselayout-2!"
 		eerror "Please do not use it with baselayout-1!".
 		return 1