[gentoo-commits] gentoo-x86 commit in sys-apps/kexec-tools/files: kexec.conf-2.0.4 kexec.init-2.0.3 kexec.init-2.0.4 kexec-tools-2.0.4-disable-kexec-test.patch

[Justin Lecher (jlec)]

jlec        13/03/27 11:50:55

  Modified:             kexec.init-2.0.3
  Added:                kexec.conf-2.0.4 kexec.init-2.0.4
                        kexec-tools-2.0.4-disable-kexec-test.patch
  Log:
  sys-apps/kexec-tools: Version BUmp; drop bashism from initscript, #447548; enhanced detection of kernel and initrd image, #412039
  
  (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

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

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

Index: kexec.init-2.0.3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec.init-2.0.3	18 Mar 2012 07:46:02 -0000	1.1
+++ kexec.init-2.0.3	27 Mar 2013 11:50:55 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2.0.3,v 1.1 2012/03/18 07:46:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.3,v 1.2 2013/03/27 11:50:55 jlec Exp $
 
 depend() {
 	need localmount



1.1                  sys-apps/kexec-tools/files/kexec.conf-2.0.4

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.conf-2.0.4?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec.conf-2.0.4?rev=1.1&content-type=text/plain

Index: kexec.conf-2.0.4
===================================================================
# Load kexec kernel image into memory during shutdown instead of bootup
# (default: yes)
#LOAD_DURING_SHUTDOWN="yes"

# Additional arguments passed to kexec (8)
#KEXEC_OPT_ARGS=""

# Kernel image partition. Mounted automatically if not.
# (default: /boot)
#BOOTPART="/boot"

# Root partition (should be autodetected)
#ROOTPART="/dev/hda3"

# Kernel image pathname, relative from BOOTPART.
# If it's one of 
# {kernel-genkernel,bzImage,vmlinuz,kernel}-<currently running kernel version>,
# or bzImage, vmlinuz (without suffix),
# then it's automaticaly detected.
# Setting it to "-" will disable kexec.
#KNAME="vmlinuz-3.9.0"

# Initrd
# Same automatic detection restriction as for KNAME apply.
# initramfs-genkernel-<currently running kernel version>,
# initrd{,.img}-<currently running kernel version>{,.img}
# will be detected.
#INITRD="/boot/fbsplash-emergence-1024x768"

# Kernel parameters (should be autodetected)
#KPARAM="splash=silent,theme:emergence"

# Do not try to mount /boot
# DONT_MOUNT_BOOT="yes"



1.1                  sys-apps/kexec-tools/files/kexec.init-2.0.4

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

Index: kexec.init-2.0.4
===================================================================
#!/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-2.0.4,v 1.1 2013/03/27 11:50:55 jlec Exp $

depend() {
	need localmount
}

image_path() {
	local x= kver=$(uname -r) karch=$(uname -m)
	BOOTPART="${BOOTPART:-/boot}"
	for x in "${KNAME:-bzImage}" 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
	done

	return 1
}

initrd_path() {
	local x= kver=$(uname -r) karch=$(uname -m)
	BOOTPART="${BOOTPART:-/boot}"
	for x in "${INITRD:-initrd}" \
		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() {
	local ret
	if [ "${KNAME}" = "-" ]; then
		ebegin "Disabling kexec"
		kexec -u; ret=$?
		eend ${ret}
		return ${ret}
	fi

	BOOTPART="${BOOTPART:-/boot}"
	local img= initrd="$(initrd_path)" mounted=false initrdopt=

	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 [ -n ${INITRD}] && [ -z ${initrd} ]; then
		eerror "Requested initrd: ${INITRD}"
		eerror "could not be found"
		return 1
	fi

	[ -n "${ROOTPART}" ] || \
		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"

	[ -n "${KPARAM}" ] || 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"

	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}"
	eend ${res}
	return ${res}
}

start() {
	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
		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
	else
		ebegin "Configuring kexec"
		load_image
		eend $?
	fi
}

stop() {
	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0

	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 $?
}



1.1                  sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kexec-tools/files/kexec-tools-2.0.4-disable-kexec-test.patch?rev=1.1&content-type=text/plain

Index: kexec-tools-2.0.4-disable-kexec-test.patch
===================================================================
diff --git kexec-tools-2.0.3/kexec_test/Makefile kexec-tools-2.0.3/kexec_test/Makefile
index fec6210..2ed4d51 100644
--- kexec-tools-2.0.3/kexec_test/Makefile
+++ kexec-tools-2.0.3/kexec_test/Makefile
@@ -8,12 +8,6 @@ dist += kexec_test/Makefile $(KEXEC_TEST_SRCS)				\
 	kexec_test/x86-setup-legacy-pic.S
 
 BUILD_KEXEC_TEST = no
-ifeq ($(ARCH),i386)
-BUILD_KEXEC_TEST = yes
-endif
-ifeq ($(ARCH),x86_64)
-BUILD_KEXEC_TEST = yes
-endif
 
 ifeq ($(BUILD_KEXEC_TEST),yes)