[patch] Detect kernels and initrds created with genkernel.

kexec.init.diff (text/plain), 1.22 KB, created by Łukasz Stelmach on 2011-06-05 23:05:26 UTC

--- /usr/portage/sys-apps/kexec-tools/files/kexec.init	2010-10-29 08:44:51.000000000 +0200
+++ /etc/init.d/kexec	2011-06-05 22:11:53.013686580 +0200
@@ -8,9 +8,24 @@
 }
 
 image_path() {
-	local x= kver=$(uname -r)
+	local x= kver=$(uname -r) karch=$(uname -m)
 	for x in "${KNAME:-bzImage}" vmlinuz \
-		bzImage-"${kver}" vmlinuz-"${kver}" ; do
+		bzImage-"${kver}" vmlinuz-"${kver}" \
+		kernel-genkernel-"${karch}"-"${kver}"; do
+		if [ -e "${BOOTPART}/${x}" ] ; then
+			echo "${BOOTPART}/${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+initrd_path() {
+	local x= kver=$(uname -r) karch=$(uname -m)
+	for x in "${INITRD:-initrd}" \
+		initrd-"${kver}" initramfs-"${kver}" \
+		initramfs-genkernel-"${karch}"-"${kver}"; do
 		if [ -e "${BOOTPART}/${x}" ] ; then
 			echo "${BOOTPART}/${x}"
 			return 0
@@ -56,11 +71,9 @@
 	fi
 
 	# Use the default initrd if it exists and none other given
-	if  [ -z "${INITRD}" -a -e "${BOOTPART}"/initrd ] ; then
-	    INITRD="${BOOTPART}/initrd"
-	fi
-	if [ -e "${INITRD}" ] ; then
-	    initrdopt="--initrd=${INITRD}"
+	initrd="$(initrd_path)"
+	if [ -n "${initrd}" -a -e "${initrd}" ] ; then
+	    initrdopt="--initrd=${initrd}"
 	fi
 
 	kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}