Fix 2 bugs in init script, patch from Richard Li and Chris Slycord in bug #219315

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 i686)

3 files changed, 52 insertions, 4 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index 8d3aacb43a11..7dfb8f88df84 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.20 2008/08/01 10:10:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.21 2008/12/18 01:06:31 dsd Exp $
+
+*kexec-tools-1.101-r6 (18 Dec 2008)
+
+  18 Dec 2008; Daniel Drake <dsd@gentoo.org> files/kexec.init,
+  +kexec-tools-1.101-r6.ebuild:
+  Fix 2 bugs in init script, patch from Richard Li and Chris Slycord in bug
+  #219315
 
 *kexec-tools-1.101-r5 (01 Aug 2008)
 
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init
index e1a096a02228..21b045cedc97 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.12 2008/08/01 10:10:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.13 2008/12/18 01:06:32 dsd Exp $
 
 depend() {
 	need localmount 
@@ -49,7 +49,7 @@ load_image() {
 
 	ebegin "Loading kernel image ${img} for kexec"
 	if [ -z "${ROOTPART}" ] ; then
-		ROOTPART="$(sed -n '/^[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /etc/mtab)"
+		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' ' ')"
@@ -83,7 +83,7 @@ stop() {
 	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
 
 	ebegin "Configuring kexec"
-	if [ "${RC_RUNLEVEL:-${RC_SOFTLEVEL:-${SOFTLEVEL}}}" != "reboot" ]; then
+	if [ "${RC_SOFTLEVEL:-${SOFTLEVEL:-${RC_RUNLEVEL:-${RUNLEVEL}}}}" != "reboot" ]; then
 		einfo "Not rebooting, so disabling"
 		kexec -u
 		return 0
diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r6.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r6.ebuild
new file mode 100644
index 000000000000..72d3857174b7
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-1.101-r6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 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-r6.ebuild,v 1.1 2008/12/18 01:06:31 dsd Exp $
+
+inherit eutils
+
+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
+	http://lse.sourceforge.net/kdump/patches/1.101-kdump10/kexec-tools-1.101-kdump10.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zlib"
+DEPEND="zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/kexec-tools-1.101-kdump10.patch
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${P}-ppc64.patch
+	epatch "${FILESDIR}"/kexec-linux-headers.patch
+	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
+}
+
+src_compile() {
+	econf $(use_with zlib) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	doman kexec/kexec.8
+	dodoc News AUTHORS TODO
+
+	newinitd "${FILESDIR}"/kexec.init kexec
+	newconfd "${FILESDIR}"/kexec.conf kexec
+}