fix logic in previous change for bug #229903. Pointed out by Walter Meinl <wuno@lsvw.de>

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 14 insertions, 9 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 0c40d6f98fc2..708a1ee486f9 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.121 2008/10/26 03:03:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.122 2008/10/28 16:27:39 cardoe Exp $
+
+  28 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
+  files/device-mapper.rc-1.02.22-r3:
+  fix logic in previous change for bug #229903. Pointed out by Walter Meinl
+  <wuno@lsvw.de>
 
   26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
   device-mapper-1.02.27.ebuild:
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 266b6ab88a97..97b259446fe5 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -12,7 +12,7 @@ AUX device-mapper-1.02.26-export-format.diff 11120 RMD160 c7abc681027f44a1a2f978
 AUX device-mapper-1.02.27-export-format.diff 10774 RMD160 7e6b804ab39038751e0b6b2c55aef3eb32ae963f SHA1 de3512bb81a06c0b26040ce11ed141ebfcd67a37 SHA256 ddeb28b0ac4aa5c428577da4f8334afb89b48c5b0134127f130f2037f22cb0bd
 AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
 AUX device-mapper.rc 615 RMD160 741f1f771665e33f995442567376060a749d56c1 SHA1 a44e73c73865757d8d00161bc07374de535e70bd SHA256 730753883de0e992a0bfa31038780edf31d0957fdbef304fd8880c6d0dc7798e
-AUX device-mapper.rc-1.02.22-r3 623 RMD160 4bc2a5822261ef1d3a4d96777c06f8554d00cf53 SHA1 5e4d41dbd998ed7455e77d0b15919d7124975c58 SHA256 7143795368701481577a3cec5a0600d8c837bf368c6113a8f6d422f3af99ef56
+AUX device-mapper.rc-1.02.22-r3 627 RMD160 00a4533fae2de9f1656b3d20c2e846bf19be0bb8 SHA1 4ca3e94b018f3292cbe30873a149cdfaacc5fe3b SHA256 57bcb58525a10970c6756daddcc4c17e78b188837be53fe6740b03f6b187eda5
 AUX dm-start.sh 2124 RMD160 c545e6ffafba981baf60b0fae68492dc7fd98b19 SHA1 59afedd1813c9e28cc89c7baf58071706c1c0de7 SHA256 2de52be0dda02d5d93aa8746c372b01c570d5a8947c71a617b186b21a3e4b325
 AUX dmtab 426 RMD160 59b4a51881ec14c393f1a043d39732246854173e SHA1 042a5e3c539dd17f30718f6b60635a6c1fa4ddaa SHA256 a7d5976c780b23193ec78146e4ed12e0cd0deca853ee0198baa4eeaf2cdc53f2
 DIST device-mapper.1.02.19.tgz 183064 RMD160 00b584c67856ab18323bcc2918aed5ac4198cb65 SHA1 8b779c24a63630065fca97cca14d5630ccb9ad9d SHA256 4723a4ba55e10c58a4e1bd7551e1e7d90ce43d3fcdabfd78285d39c2d33cdead
@@ -33,12 +33,12 @@ EBUILD device-mapper-1.02.24.ebuild 2172 RMD160 df8dc287151ac787ce06eafc2e2c7d84
 EBUILD device-mapper-1.02.25.ebuild 2209 RMD160 5663bd0d59c1cd96aea4cc687461d6c6f5933391 SHA1 8dd25dc08b1e8308249a21dcedbc79563242c5fd SHA256 6bf4e832edebc55af6e6103395050eb0a306d8c3369e2be07fee3386ce9f2621
 EBUILD device-mapper-1.02.26.ebuild 2205 RMD160 186bd93dbe53e943b796f73de4250feb53da9733 SHA1 2a6d05e39b5f797b51ef119cde6737a2f3836bf6 SHA256 cf146a63ccfb403a5cc58e444c1a056c616b1ad1695657f63cdf274065d3eac8
 EBUILD device-mapper-1.02.27.ebuild 2180 RMD160 ec212ebf5eb5059d54178aef65f5db3d0d8898eb SHA1 3a832a23d8a48b1a84a41b9eb66bec3064b7aba9 SHA256 5f21cddc16920db505c83cdf3f4a1077cf401ea17d3376ed5d431bc44add0087
-MISC ChangeLog 21259 RMD160 17cec7420976809901a3d1279ccb4ecd720881bd SHA1 5e98db25da97dd69497bd3edefe945f12be9362a SHA256 94534eb2fe1d9e15f5ffbb0863c6bd7588afefc2317531d2369900466d13847b
+MISC ChangeLog 21440 RMD160 db7f2230d2a4d1a93a3b9e5cb5b06768e9952a76 SHA1 aeeacb1d9fba4b8a23f99f1e9c4b527f35f75b41 SHA256 72408edd43db227e925ef91f132b065227c0b45bf420f202bf870c2fde6a6f67
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkD3g8ACgkQ67wieSYcaxcKbwCg0lacxksAfdPxYsu48UPqdO7I
-1cQAoL6jEqcpyQSf5H4z30paGECn5nSj
-=5q9h
+iEYEARECAAYFAkkHPaMACgkQoeSe8B0zEfzEdQCffme/ktLkNMMik1wZg6WtRWx+
+glMAnitu9gxITi5M6I//fHSHbsn2G8/u
+=lxRg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3 b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
index a34d82c8dda2..a359da54bd3b 100644
--- a/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
+++ b/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3
@@ -1,10 +1,10 @@
 #!/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/device-mapper/files/device-mapper.rc-1.02.22-r3,v 1.6 2008/10/26 02:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3,v 1.7 2008/10/28 16:27:40 cardoe Exp $
 
 depend() {
-	if [ -e /etc/init.d/root ] ; then
+	if [ ! -e /etc/init.d/root ] ; then
 		# on baselayout-1 this causes
 		# a dependency loop with checkroot (before *)
 		after modules
@@ -13,7 +13,7 @@ depend() {
 }
 
 start() {
-	if [ -e /etc/init.d/root ] ; then
+	if [ ! -e /etc/init.d/root ] ; then
 		eerror "The ${SVCNAME} init script is written for baselayout-2"
 		eerror "Please do not use it with baselayout-1"
 		return 1