diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2008-01-21 08:51:10 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2008-01-21 08:51:10 +0000 |
| commit | 0eccbea2007a38126d7df2c19100a461fa037fbd (patch) | |
| tree | e9ab2717c2b8a25ef2d4253d87024d03c201a96e /sys-apps/kexec-tools | |
| parent | We need dev-perl/XML-DOM for tests, adding the dep (diff) | |
| download | gentoo-2-0eccbea2007a38126d7df2c19100a461fa037fbd.tar.gz gentoo-2-0eccbea2007a38126d7df2c19100a461fa037fbd.tar.bz2 gentoo-2-0eccbea2007a38126d7df2c19100a461fa037fbd.zip | |
set KPARAM correctly thanks to Friedrich Oslage <bluebird@porno-bullen.de> in bug 203406
(Portage version: 2.1.4)
Diffstat (limited to 'sys-apps/kexec-tools')
| -rw-r--r-- | sys-apps/kexec-tools/ChangeLog | 8 | ||||
| -rwxr-xr-x | sys-apps/kexec-tools/files/kexec.init | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog index e37c9efbf31c..d6c7cc681ba6 100644 --- a/sys-apps/kexec-tools/ChangeLog +++ b/sys-apps/kexec-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/kexec-tools -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.16 2007/05/12 02:06:33 dsd Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.17 2008/01/21 08:51:09 genstef Exp $ + + 21 Jan 2008; Stefan Schweizer <genstef@gentoo.org> files/kexec.init: + set KPARAM correctly thanks to Friedrich Oslage <bluebird@porno-bullen.de> + in bug 203406 12 May 2007; Daniel Drake <dsd@gentoo.org> metadata.xml: Move from kernel to kernel-misc herd diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init index 785831bf0693..10cf6e58a63a 100755 --- a/sys-apps/kexec-tools/files/kexec.init +++ b/sys-apps/kexec-tools/files/kexec.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 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,v 1.9 2007/03/13 07:33:24 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.10 2008/01/21 08:51:10 genstef Exp $ depend() { need localmount @@ -52,7 +52,7 @@ load_image() { ROOTPART="$(sed -n '/^[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /etc/mtab)" fi if [ -z "${KPARAM}" ] ; then - KPARAM="$(sed -r 's:root=[a-zA-Z0-9/]+\s*::g' /proc/cmdline)" + KPARAM="$(sed -e 's/ /\n/g' /proc/cmdline | grep -v -e "^root=" | tr '\n' ' ')" fi # Use the default initrd if it exists and none other given |