[gentoo-commits] gentoo-x86 commit in sys-apps/kexec-tools/files: kexec.init-9999

[Justin Lecher (jlec)]

jlec        13/12/28 20:27:31

  Modified:             kexec.init-9999
  Log:
  sys-apps/kexec-tools: Propagate changes to live ebuild
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.2                  sys-apps/kexec-tools/files/kexec.init-9999

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999?r1=1.1&r2=1.2

Index: kexec.init-9999
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec.init-9999	21 Sep 2013 11:35:53 -0000	1.1
+++ kexec.init-9999	28 Dec 2013 20:27:31 -0000	1.2
@@ -1,17 +1,25 @@
 #!/sbin/runscript
 # Copyright 1999-2013 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-9999,v 1.1 2013/09/21 11:35:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999,v 1.2 2013/12/28 20:27:31 jlec Exp $
 
 depend() {
 	need localmount
 }
 
 image_path() {
-	local x= kver=$(uname -r)
-	for x in "${KNAME:-bzImage}" vmlinuz \
-		bzImage-"${kver}" vmlinuz-"${kver}" ; do
-		if [ -e "${BOOTPART}/${x}" ] ; then
+	local x= kver=$(uname -r) karch=$(uname -m)
+	BOOTPART="${BOOTPART:-/boot}"
+	KNAME="${KNAME:-bzImage}"
+	if [ -e "${KNAME}" ]; then
+		echo "${KNAME}"
+		return 0
+	fi
+	for x in "${KNAME#${BOOTPART}}" vmlinuz \
+		bzImage-${kver} vmlinuz-${kver} \
+		kernel-genkernel-${karch}-${kver} \
+		kernel-${kver} kernel-${karch}; do
+		if [ -e "${BOOTPART}/${x}" ]; then
 			echo "${BOOTPART}/${x}"
 			return 0
 		fi
@@ -20,50 +28,89 @@
 	return 1
 }
 
+initrd_path() {
+	local x= kver=$(uname -r) karch=$(uname -m)
+	BOOTPART="${BOOTPART:-/boot}"
+	INITRD="${INITRD:-initrd}"
+	if [ -e "${INITRD}" ]; then
+		echo "${INITRD}"
+		return 0
+	fi
+	for x in "${INITRD#${BOOTPART}}" \
+		initrd.img-${kver} initrd-${kver}.img \
+		initrd-${kver} initramfs-${kver}.img \
+		initramfs-genkernel-${karch}-${kver} ; do
+		if [ -e "${BOOTPART}/${x}" ]; then
+			echo "${BOOTPART}/${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+mount_boot(){
+	local ret
+
+	[ -n "${DONT_MOUNT_BOOT}" ] && return 1
+	grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
+
+	BOOTPART="${BOOTPART:-/boot}"
+	ebegin "Mounting ${BOOTPART}"
+	mount "${BOOTPART}"; ret=$?
+	eend ${ret}
+	return ${ret}
+}
+
 load_image() {
-	if [ "${KNAME}" = "-" ] ; then
+	local ret
+	if [ "${KNAME}" = "-" ]; then
 		ebegin "Disabling kexec"
-		kexec -u
-		eend $?
-		return $?
+		kexec -u; ret=$?
+		eend ${ret}
+		return ${ret}
 	fi
 
 	BOOTPART="${BOOTPART:-/boot}"
-	local img="$(image_path)" mounted=false initrdopt=
+	local img= initrd="$(initrd_path)" mounted=false initrdopt=
 
-	if [ -z "${img}" ] ; then
-		# If we cannot find our image, try mounting ${BOOTPART}
-		if ! grep -q " ${BOOTPART} " /proc/mounts ; then
-			ebegin "Mounting ${BOOTPART}"
-			mount "${BOOTPART}" && mounted=true
-			eend $? || return $?
-			img="$(image_path)"
+	if ! img="$(image_path)"; then
+		if mount_boot; then
+			if img="$(image_path)"; then
+				mounted=true
+				initrd="$(initrd_path)"
+			else
+				eerror "No kernel image found in ${BOOTPART}!"
+				umount "${BOOTPART}"
+				return 1
+			fi
+		else
+			eerror "No kernel image found in ${BOOTPART}!"
+			return 1
 		fi
 	fi
 
-	if [ -z "${img}" ] ; then
-		eerror "No kernel image found in ${BOOTPART}!"
-		${mounted} && umount "${BOOTPART}"
+	if [ -n "${INITRD}" ] && \
+		! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
+		eerror "Requested initrd: ${INITRD#${BOOTPART}}"
+		eerror "could not be found"
 		return 1
 	fi
 
-	ebegin "Loading kernel image ${img} for kexec"
-	if [ -z "${ROOTPART}" ] ; then
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /etc/mtab)")"
-	fi
-	if [ -z "${KPARAM}" ] ; then
-		KPARAM="$(sed -e 's/ /\n/g' /proc/cmdline | grep -v -e "^root=" | tr '\n' ' ')"
-	fi
+	[ -n "${ROOTPART}" ] || \
+		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
 
-	# 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}"
-	fi
+	[ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
+
+	[ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}"
+
+	local msg=
+	[ -n "${initrd}" ] && \
+		msg="with ${initrd}"
+	einfo "Using kernel image ${img} ${msg} for kexec"
 
-	kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
+	ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
+	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
 	local res=$?
 
 	${mounted} && umount "${BOOTPART}"
@@ -72,23 +119,47 @@
 }
 
 start() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ] && return 0
-
-	ebegin "Configuring kexec"
-	load_image
-	eend 0
+	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
+		local ret=0
+		BOOTPART="${BOOTPART:-/boot}"
+		if mount_boot; then
+			mounted=true
+		fi
+		if ! image_path > /dev/null; then
+			ewarn "Cannot find kernel image!"
+			ewarn "Please make sure a valid kernel image is present before reboot."
+			return 0
+		fi
+		if [ -n "${mounted}" ]; then
+			ebegin "Unmounting ${BOOTPART}"
+			umount "${BOOTPART}"; ret=$?
+			eend ${ret}
+		fi
+		return ${ret}
+	else
+		ebegin "Configuring kexec"
+		load_image
+		eend $?
+	fi
 }
 
 stop() {
 	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
 
-	ebegin "Configuring kexec"
-	if [ "`/sbin/runlevel|/bin/cut -c 3`" != "6" ]; then
+	if ! yesno $RC_REBOOT; then
 		einfo "Not rebooting, so disabling"
 		kexec -u
 		return 0
 	fi
 
+	if [ -f /nokexec ]; then
+		einfo "Not using kexec during reboot"
+		rm -f /nokexec
+		kexec -u
+		return 0
+	fi
+
+	ebegin "Configuring kexec"
 	load_image
 	eend $?
 }