[gentoo-commits] gentoo-x86 commit in sys-apps/kexec-tools/files: kexec.init-2.0.4

[Justin Lecher (jlec)]

jlec        13/03/30 13:01:50

  Modified:             kexec.init-2.0.4
  Log:
  sys-apps/kexec-tools: Fix init script if no initrd is used, #463752
  
  (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

Revision  Changes    Path
1.2                  sys-apps/kexec-tools/files/kexec.init-2.0.4

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4?r1=1.1&r2=1.2

Index: kexec.init-2.0.4
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec.init-2.0.4	27 Mar 2013 11:50:55 -0000	1.1
+++ kexec.init-2.0.4	30 Mar 2013 13:01:50 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4,v 1.1 2013/03/27 11:50:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4,v 1.2 2013/03/30 13:01:50 jlec Exp $
 
 depend() {
 	need localmount
@@ -80,7 +80,8 @@
 		fi
 	fi
 
-	if [ -n ${INITRD}] && [ -z ${initrd} ]; then
+	if [ -n "${INITRD}" ] && \
+		! [ "${INITRD}" == "${initrd}" ]; then
 		eerror "Requested initrd: ${INITRD}"
 		eerror "could not be found"
 		return 1