summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2008-10-28 16:27:40 +0000
committerDoug Goldstein <cardoe@gentoo.org>2008-10-28 16:27:40 +0000
commita8700104514dd5be42013e67d5ccd36b2f6fa1b8 (patch)
tree37816c389631f791ad05555e2542352ebf1d691e /sys-fs/device-mapper
parentpreferred depends need to go first (diff)
downloadgentoo-2-a8700104514dd5be42013e67d5ccd36b2f6fa1b8.tar.gz
gentoo-2-a8700104514dd5be42013e67d5ccd36b2f6fa1b8.tar.bz2
gentoo-2-a8700104514dd5be42013e67d5ccd36b2f6fa1b8.zip
fix logic in previous change for bug #229903. Pointed out by Walter Meinl <wuno@lsvw.de>
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'sys-fs/device-mapper')
-rw-r--r--sys-fs/device-mapper/ChangeLog7
-rw-r--r--sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r36
2 files changed, 9 insertions, 4 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/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