Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/kexec-tools/files: kexec.init
Date: Fri, 29 Oct 2010 06:44:55
Message-Id: 20101029064451.BF12020054@flycatcher.gentoo.org
1 jlec 10/10/29 06:44:51
2
3 Modified: kexec.init
4 Log:
5 Cleaned extra whitespaces in init script
6
7 (Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.15 sys-apps/kexec-tools/files/kexec.init
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init?r1=1.14&r2=1.15
15
16 Index: kexec.init
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -u -r1.14 -r1.15
22 --- kexec.init 12 Apr 2009 04:45:19 -0000 1.14
23 +++ kexec.init 29 Oct 2010 06:44:51 -0000 1.15
24 @@ -1,10 +1,10 @@
25 #!/sbin/runscript
26 -# Copyright 1999-2005 Gentoo Foundation
27 +# Copyright 1999-2010 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.14 2009/04/12 04:45:19 darkside Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.15 2010/10/29 06:44:51 jlec Exp $
31
32 depend() {
33 - need localmount
34 + need localmount
35 }
36
37 image_path() {
38 @@ -27,7 +27,7 @@
39 eend $?
40 return $?
41 fi
42 -
43 +
44 BOOTPART="${BOOTPART:-/boot}"
45 local img="$(image_path)" mounted=false initrdopt=
46
47 @@ -40,7 +40,7 @@
48 img="$(image_path)"
49 fi
50 fi
51 -
52 +
53 if [ -z "${img}" ] ; then
54 eerror "No kernel image found in ${BOOTPART}!"
55 ${mounted} && umount "${BOOTPART}"
56 @@ -56,7 +56,7 @@
57 fi
58
59 # Use the default initrd if it exists and none other given
60 - if [ -z "${INITRD}" -a -e "${BOOTPART}"/initrd ] ; then
61 + if [ -z "${INITRD}" -a -e "${BOOTPART}"/initrd ] ; then
62 INITRD="${BOOTPART}/initrd"
63 fi
64 if [ -e "${INITRD}" ] ; then
65 @@ -65,7 +65,7 @@
66
67 kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
68 local res=$?
69 -
70 +
71 ${mounted} && umount "${BOOTPART}"
72 eend ${res}
73 return ${res}