Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/kexec-tools/files: kexec.init
Date: Fri, 01 Aug 2008 10:10:08
Message-Id: E1KOraH-0000aH-LW@stork.gentoo.org
1 zzam 08/08/01 10:10:05
2
3 Modified: kexec.init
4 Log:
5 Fixed init script to detect reboot also with baselayout-2, Bug #218268.
6 (Portage version: 2.2_rc5/cvs/Linux 2.6.25-tuxonice-r6 i686)
7
8 Revision Changes Path
9 1.12 sys-apps/kexec-tools/files/kexec.init
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?rev=1.12&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?rev=1.12&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?r1=1.11&r2=1.12
14
15 Index: kexec.init
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v
18 retrieving revision 1.11
19 retrieving revision 1.12
20 diff -u -r1.11 -r1.12
21 --- kexec.init 21 Mar 2008 09:43:55 -0000 1.11
22 +++ kexec.init 1 Aug 2008 10:10:05 -0000 1.12
23 @@ -1,7 +1,7 @@
24 #!/sbin/runscript
25 # Copyright 1999-2005 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.11 2008/03/21 09:43:55 genstef Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.12 2008/08/01 10:10:05 zzam Exp $
29
30 depend() {
31 need localmount
32 @@ -83,7 +83,7 @@
33 [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
34
35 ebegin "Configuring kexec"
36 - if [ "${RC_SOFTLEVEL:-${SOFTLEVEL}}" != "reboot" ]; then
37 + if [ "${RC_RUNLEVEL:-${RC_SOFTLEVEL:-${SOFTLEVEL}}}" != "reboot" ]; then
38 einfo "Not rebooting, so disabling"
39 kexec -u
40 return 0