summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-01-20 20:39:09 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-01-20 20:39:09 +0000
commit59fe38b3443af097401731662070637b47cfa02c (patch)
tree6b8cd9520d6e00efca6c606bd722384bd24d1970 /sys-apps/kexec-tools/files
parentAdded modular X dependencies and closing bug #119096. (diff)
downloadgentoo-2-59fe38b3443af097401731662070637b47cfa02c.tar.gz
gentoo-2-59fe38b3443af097401731662070637b47cfa02c.tar.bz2
gentoo-2-59fe38b3443af097401731662070637b47cfa02c.zip
Add KPARAM autodetection thanks to James Le Cuirot <chewi@ffaura.com> in bug 107527
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-apps/kexec-tools/files')
-rw-r--r--sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r11
-rw-r--r--sys-apps/kexec-tools/files/kexec.conf2
-rwxr-xr-xsys-apps/kexec-tools/files/kexec.init3
3 files changed, 4 insertions, 2 deletions
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" != "-" ]