Add KPARAM autodetection thanks to James Le Cuirot <chewi@ffaura.com> in bug 107527

(Portage version: 2.1_pre3-r1)

6 files changed, 40 insertions, 17 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index 8d04fcc338ec..1358e6fcd027 100644
--- a/sys-apps/kexec-tools/ChangeLog
+++ b/sys-apps/kexec-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/kexec-tools
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.4 2005/10/29 07:42:29 halcy0n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.5 2006/01/20 20:39:09 genstef Exp $
+
+*kexec-tools-1.101-r1 (20 Jan 2006)
+
+  20 Jan 2006; Stefan Schweizer <genstef@gentoo.org> files/kexec.conf,
+  files/kexec.init, +kexec-tools-1.101-r1.ebuild:
+  Add KPARAM autodetection thanks to James Le Cuirot <chewi@ffaura.com> in bug
+  107527
 
   29 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kexec-tools-1.101.ebuild:
   Stable on x86; bug #110734
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index bc72d5317382..a04d531476fd 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5a5a5194bd404c2455789986a3d44813 ChangeLog 1231
+MD5 95e1a34a76c91ca1b3dd4f4879747a8e ChangeLog 1478
 MD5 3346c0b5fcc5f5974c6edb1a43acec3e files/digest-kexec-tools-1.100-r1 69
 MD5 66fbf8cb76d68e3bc10effd7fec63974 files/digest-kexec-tools-1.101 69
-MD5 2fb1b484f2ce28a6f360ca237856b532 files/kexec.conf 267
-MD5 9a8673a8d6250ce2cc4d7889fc1852f2 files/kexec.init 1210
+MD5 66fbf8cb76d68e3bc10effd7fec63974 files/digest-kexec-tools-1.101-r1 69
+MD5 d6017250a94f6bd50a9744694b02da7f files/kexec.conf 292
+MD5 511cdcb85778b2dc378327f659b79cdd files/kexec.init 1292
 MD5 5ccd33e89ab18e2a83476d6a60fa9030 kexec-tools-1.100-r1.ebuild 692
+MD5 7d0cbf294ff23a9edacfe74c6c4ee5e4 kexec-tools-1.101-r1.ebuild 695
 MD5 905c6adbdbf88509d95c342774b3b931 kexec-tools-1.101.ebuild 694
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjrE4gIKl8Uu19MoRAoF9AJ0TigWe4iL+2WYJreVUg63KjP4WNgCfR8hK
-/nAByaHg31Y68RqeL0zvfpM=
-=Ikhc
------END PGP SIGNATURE-----
diff --git a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r1 b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r1
new file mode 100644
index 000000000000..71334efb5b70
--- /dev/null
+++ b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r1
@@ -0,0 +1 @@
+MD5 b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz 206785
diff --git a/sys-apps/kexec-tools/files/kexec.conf b/sys-apps/kexec-tools/files/kexec.conf
index eb8cb7273ced..005a82d98981 100644
--- a/sys-apps/kexec-tools/files/kexec.conf
+++ b/sys-apps/kexec-tools/files/kexec.conf
@@ -8,7 +8,7 @@
 # Root partition (should be autodetected)
 #ROOTPART="/dev/hda3"
 
-# Kernel parameters
+# Kernel parameters (should be autodetected)
 #KPARAM="splash=silent,theme:emergence"
 
 # Initrd
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init
index d3a8a7bd0e9b..dea576fd8e8f 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.4 2005/11/20 12:24:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.5 2006/01/20 20:39:09 genstef Exp $
 
 depend() {
 	need checkfs
@@ -12,6 +12,7 @@ start() {
 	[ -z "$BOOTPATH" ] && BOOTPATH="/boot"
 	[ -z "$BOOTMOUNT" ] && BOOTMOUNT=1
 	[ -z "$ROOTPART" ] && ROOTPART="`cut -f 1 -d' ' /etc/mtab | grep / | tr '\n' '\t' | cut -f 1`"
+	[ -z "$KPARAM" ] && KPARAM="`sed -r 's:root=[a-zA-Z0-9/]+\s*::g' /proc/cmdline`"
 	[ -n "$INITRD" ] && INITRDOPT="--initrd=$INITRD"
 
 	if [ "$KNAME" != "-" ]
diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r1.ebuild
new file mode 100644
index 000000000000..04b74a90e134
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-1.101-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101-r1.ebuild,v 1.1 2006/01/20 20:39:09 genstef Exp $
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/"
+SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	into /
+	dosbin objdir*/build/sbin/kexec || die "dosbin failed"
+	doman kexec/kexec.8
+	dodoc News AUTHORS TODO
+
+	newinitd ${FILESDIR}/kexec.init kexec
+	newconfd ${FILESDIR}/kexec.conf kexec
+}