diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-30 13:01:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-30 13:01:50 +0000 |
| commit | afb194978ef96c53fb907934d2f1e77966a509f5 (patch) | |
| tree | 06fc9b5d30053df43f27fe340f981295605b4492 /sys-apps/kexec-tools | |
| parent | Quote patterns for python_gen_usedep. (diff) | |
| download | gentoo-2-afb194978ef96c53fb907934d2f1e77966a509f5.tar.gz gentoo-2-afb194978ef96c53fb907934d2f1e77966a509f5.tar.bz2 gentoo-2-afb194978ef96c53fb907934d2f1e77966a509f5.zip | |
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)
Diffstat (limited to 'sys-apps/kexec-tools')
| -rw-r--r-- | sys-apps/kexec-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/files/kexec.init-2.0.4 | 5 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/kexec-tools-2.0.4-r1.ebuild (renamed from sys-apps/kexec-tools/kexec-tools-2.0.4.ebuild) | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog index 8e20b8f3f698..fcb603881ab5 100644 --- a/sys-apps/kexec-tools/ChangeLog +++ b/sys-apps/kexec-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/kexec-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.47 2013/03/27 11:50:54 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.48 2013/03/30 13:01:49 jlec Exp $ + +*kexec-tools-2.0.4-r1 (30 Mar 2013) + + 30 Mar 2013; Justin Lecher <jlec@gentoo.org> files/kexec.init-2.0.4, + -kexec-tools-2.0.4.ebuild, +kexec-tools-2.0.4-r1.ebuild: + Fix init script if no initrd is used, #463752 *kexec-tools-2.0.4 (27 Mar 2013) diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4 b/sys-apps/kexec-tools/files/kexec.init-2.0.4 index 5977111d7c42..1aed33ea06e6 100644 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.4 +++ b/sys-apps/kexec-tools/files/kexec.init-2.0.4 @@ -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 @@ load_image() { 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 diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r1.ebuild index 3c7013e81ded..f9f829329932 100644 --- a/sys-apps/kexec-tools/kexec-tools-2.0.4.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-2.0.4-r1.ebuild @@ -1,6 +1,6 @@ # 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/kexec-tools-2.0.4.ebuild,v 1.1 2013/03/27 11:50:54 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.4-r1.ebuild,v 1.1 2013/03/30 13:01:49 jlec Exp $ EAPI=5 |