From: | "Doug Goldstein (cardoe)" <cardoe@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-fs/device-mapper/files: device-mapper.rc-1.02.22-r3 |
Date: | Tue, 28 Oct 2008 16:27:41 |
Message-Id: | E1KurPw-00028b-4j@stork.gentoo.org |
1 | cardoe 08/10/28 16:27:40 |
2 | |
3 | Modified: device-mapper.rc-1.02.22-r3 |
4 | Log: |
5 | fix logic in previous change for bug #229903. Pointed out by Walter Meinl <wuno@××××.de> |
6 | (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.7 sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3 |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3?rev=1.7&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3?rev=1.7&content-type=text/plain |
13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3?r1=1.6&r2=1.7 |
14 | |
15 | Index: device-mapper.rc-1.02.22-r3 |
16 | =================================================================== |
17 | RCS file: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/files/device-mapper.rc-1.02.22-r3,v |
18 | retrieving revision 1.6 |
19 | retrieving revision 1.7 |
20 | diff -u -r1.6 -r1.7 |
21 | --- device-mapper.rc-1.02.22-r3 26 Oct 2008 02:55:25 -0000 1.6 |
22 | +++ device-mapper.rc-1.02.22-r3 28 Oct 2008 16:27:40 -0000 1.7 |
23 | @@ -1,10 +1,10 @@ |
24 | #!/sbin/runscript |
25 | # Copyright 1999-2008 Gentoo Foundation |
26 | # Distributed under the terms of the GNU General Public License v2 |
27 | -# $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 $ |
28 | +# $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 $ |
29 | |
30 | depend() { |
31 | - if [ -e /etc/init.d/root ] ; then |
32 | + if [ ! -e /etc/init.d/root ] ; then |
33 | # on baselayout-1 this causes |
34 | # a dependency loop with checkroot (before *) |
35 | after modules |
36 | @@ -13,7 +13,7 @@ |
37 | } |
38 | |
39 | start() { |
40 | - if [ -e /etc/init.d/root ] ; then |
41 | + if [ ! -e /etc/init.d/root ] ; then |
42 | eerror "The ${SVCNAME} init script is written for baselayout-2" |
43 | eerror "Please do not use it with baselayout-1" |
44 | return 1 |