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 | c0ea9bbebc7fe66e60df0a15ecf2467139bfc0a3 (patch) | |
| tree | 8effb51fd98a3cd17611c772ccd9b0f181e616c1 /sys-apps/kexec-tools | |
| parent | We need dev-perl/XML-DOM for tests, adding the dep (diff) | |
| download | historical-c0ea9bbebc7fe66e60df0a15ecf2467139bfc0a3.tar.gz historical-c0ea9bbebc7fe66e60df0a15ecf2467139bfc0a3.tar.bz2 historical-c0ea9bbebc7fe66e60df0a15ecf2467139bfc0a3.zip | |
set KPARAM correctly thanks to Friedrich Oslage <bluebird@porno-bullen.de> in bug 203406
Package-Manager: portage-2.1.4
Diffstat (limited to 'sys-apps/kexec-tools')
| -rw-r--r-- | sys-apps/kexec-tools/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/kexec-tools/Manifest | 16 | ||||
| -rwxr-xr-x | sys-apps/kexec-tools/files/kexec.init | 4 |
3 files changed, 16 insertions, 12 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/Manifest b/sys-apps/kexec-tools/Manifest index a426e14d5631..2e82ccd03f66 100644 --- a/sys-apps/kexec-tools/Manifest +++ b/sys-apps/kexec-tools/Manifest @@ -18,10 +18,10 @@ AUX kexec.conf 397 RMD160 a366158ef7a24764c7e42bd0a246e035587d0c42 SHA1 46760b27 MD5 d2c4d35d9a5644a4579916365143c51e files/kexec.conf 397 RMD160 a366158ef7a24764c7e42bd0a246e035587d0c42 files/kexec.conf 397 SHA256 59bd15f8a0be3a41a457e61cfbb3520252773ed6422b9b223b347dfeb54f152a files/kexec.conf 397 -AUX kexec.init 2104 RMD160 8218854d47d10d5d4838df597f10e5f79d8fc237 SHA1 77762addcc1b4101d10748770453ca73a64233e3 SHA256 2eaaee707a831732e25c29ac36aace05ba3caaf865be2baa4d730a6610df33e3 -MD5 3f6f94f15333db9f920ebf53ae29192a files/kexec.init 2104 -RMD160 8218854d47d10d5d4838df597f10e5f79d8fc237 files/kexec.init 2104 -SHA256 2eaaee707a831732e25c29ac36aace05ba3caaf865be2baa4d730a6610df33e3 files/kexec.init 2104 +AUX kexec.init 2122 RMD160 473af9464dcddbac150032f8f3bb10bb4e0274f2 SHA1 6de316a683af7c3c2c2f8250a0a9f3dab41c29ea SHA256 913c72abdfc8f588fb1cf8edbc7768944fa06071a6edfe585823944d98782b99 +MD5 e87eca70a9dd267944e111759e2d0fd9 files/kexec.init 2122 +RMD160 473af9464dcddbac150032f8f3bb10bb4e0274f2 files/kexec.init 2122 +SHA256 913c72abdfc8f588fb1cf8edbc7768944fa06071a6edfe585823944d98782b99 files/kexec.init 2122 DIST kexec-tools-1.101-kdump10.patch 246975 RMD160 67a94b54c848a2c85bfd0801766f02d76c44bba7 SHA1 f995ba47838dd99d23f3368560257ea5800136f0 SHA256 6ca5dd055d1714bb6c2e7aad44c84171673573d95ca832f06f37eaa39d926863 DIST kexec-tools-1.101.tar.gz 206785 RMD160 2c6cb949f1f9ac2871a5616d890edbe0bc43768a SHA1 65234ec68ca19c5d444375b923fecbb9ce28b255 SHA256 280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 EBUILD kexec-tools-1.101-r3.ebuild 1156 RMD160 d5d85739a99b214b6b2ba31117870fcc97edda35 SHA1 63bb36f19edaf5168e75573034e81263e3a4974a SHA256 bae59bd7857817b02d3ad768717d44136dc57c0ca1ef83d415bddc0468aec0e0 @@ -36,10 +36,10 @@ EBUILD kexec-tools-9999.ebuild 1000 RMD160 7a40485eeaf922511de800e4b0a1ff0077738 MD5 2663dc43f9124edf83b88fcadf90be98 kexec-tools-9999.ebuild 1000 RMD160 7a40485eeaf922511de800e4b0a1ff00777389e5 kexec-tools-9999.ebuild 1000 SHA256 e0b407bbea9f21d7345e81db174faa09fb1b76d5ba84053d1f8d152dbcc91815 kexec-tools-9999.ebuild 1000 -MISC ChangeLog 3792 RMD160 2b1e238acbe62de695f9feb47faaeb142444ec9d SHA1 709361bd5f5e841da4cf6186aa7d58955010448b SHA256 a05027d81a5ec96b4003dade1dca628f50fd65aedfef3d821dfdfcfd0fe4575f -MD5 4be0f5a70451b78a700736cbc754f721 ChangeLog 3792 -RMD160 2b1e238acbe62de695f9feb47faaeb142444ec9d ChangeLog 3792 -SHA256 a05027d81a5ec96b4003dade1dca628f50fd65aedfef3d821dfdfcfd0fe4575f ChangeLog 3792 +MISC ChangeLog 3961 RMD160 4ecb46f85a7b3fc3edabfdb74a85fddf393522ff SHA1 afb8f140267ac20d6a5acf6af366e1747d630d0b SHA256 3dfe1b996aa736d34bcdfb6294636fc26e8bbb5145d63646383c163a7d668b03 +MD5 b0fde790d81df47757f107c38e04872e ChangeLog 3961 +RMD160 4ecb46f85a7b3fc3edabfdb74a85fddf393522ff ChangeLog 3961 +SHA256 3dfe1b996aa736d34bcdfb6294636fc26e8bbb5145d63646383c163a7d668b03 ChangeLog 3961 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269 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 |