diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2008-08-01 10:10:05 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-08-01 10:10:05 +0000 |
commit | 07467985f5ff60736c901935d122658d775b2abd (patch) | |
tree | b0c1519408db19fae5e75872ff6168e3c29528ae /sys-apps/kexec-tools | |
parent | Version bump (diff) | |
download | gentoo-2-07467985f5ff60736c901935d122658d775b2abd.tar.gz gentoo-2-07467985f5ff60736c901935d122658d775b2abd.tar.bz2 gentoo-2-07467985f5ff60736c901935d122658d775b2abd.zip |
Fixed init script to detect reboot also with baselayout-2, Bug #218268.
(Portage version: 2.2_rc5/cvs/Linux 2.6.25-tuxonice-r6 i686)
Diffstat (limited to 'sys-apps/kexec-tools')
-rw-r--r-- | sys-apps/kexec-tools/ChangeLog | 8 | ||||
-rwxr-xr-x | sys-apps/kexec-tools/files/kexec.init | 4 | ||||
-rw-r--r-- | sys-apps/kexec-tools/kexec-tools-1.101-r5.ebuild | 41 |
3 files changed, 50 insertions, 3 deletions
diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog index 45ba1c15edfc..8d3aacb43a11 100644 --- a/sys-apps/kexec-tools/ChangeLog +++ b/sys-apps/kexec-tools/ChangeLog @@ -1,6 +1,12 @@ # 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.19 2008/03/21 09:43:54 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.20 2008/08/01 10:10:04 zzam Exp $ + +*kexec-tools-1.101-r5 (01 Aug 2008) + + 01 Aug 2008; Matthias Schwarzott <zzam@gentoo.org> files/kexec.init, + +kexec-tools-1.101-r5.ebuild: + Fixed init script to detect reboot also with baselayout-2, Bug #218268. 21 Mar 2008; Stefan Schweizer <genstef@gentoo.org> -files/kexec-tools-9999-LDFLAGS.patch, files/kexec.init, diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init index 7fb12935c2f3..e1a096a02228 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.11 2008/03/21 09:43:55 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.12 2008/08/01 10:10:05 zzam Exp $ depend() { need localmount @@ -83,7 +83,7 @@ stop() { [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0 ebegin "Configuring kexec" - if [ "${RC_SOFTLEVEL:-${SOFTLEVEL}}" != "reboot" ]; then + if [ "${RC_RUNLEVEL:-${RC_SOFTLEVEL:-${SOFTLEVEL}}}" != "reboot" ]; then einfo "Not rebooting, so disabling" kexec -u return 0 diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r5.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r5.ebuild new file mode 100644 index 000000000000..a44699b9343e --- /dev/null +++ b/sys-apps/kexec-tools/kexec-tools-1.101-r5.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-r5.ebuild,v 1.1 2008/08/01 10:10:04 zzam 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 +} |