diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2009-05-01 22:07:29 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2009-05-01 22:07:29 +0000 |
| commit | a1fccdeb36e388065c21b01a1eadbd1313f9b906 (patch) | |
| tree | ad53e36a96bfb74ef279c0883ec749dbda1c9a52 /sys-power | |
| parent | Cleanup (diff) | |
| download | gentoo-2-a1fccdeb36e388065c21b01a1eadbd1313f9b906.tar.gz gentoo-2-a1fccdeb36e388065c21b01a1eadbd1313f9b906.tar.bz2 gentoo-2-a1fccdeb36e388065c21b01a1eadbd1313f9b906.zip | |
Fix init.d script, see bug #265368.
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/hibernate-script/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch | 56 | ||||
| -rw-r--r-- | sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild (renamed from sys-power/hibernate-script/hibernate-script-2.0.ebuild) | 11 |
3 files changed, 74 insertions, 2 deletions
diff --git a/sys-power/hibernate-script/ChangeLog b/sys-power/hibernate-script/ChangeLog index c55db2223491..c1b8048866df 100644 --- a/sys-power/hibernate-script/ChangeLog +++ b/sys-power/hibernate-script/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-power/hibernate-script # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.82 2009/04/04 11:43:03 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/ChangeLog,v 1.83 2009/05/01 22:07:29 nelchael Exp $ + +*hibernate-script-2.0-r1 (01 May 2009) + + 01 May 2009; Krzysiek Pawlik <nelchael@gentoo.org> + -hibernate-script-2.0.ebuild, +hibernate-script-2.0-r1.ebuild, + +files/hibernate-script-2.0-init.d.patch: + Fix init.d script, see bug #265368. *hibernate-script-2.0 (04 Apr 2009) diff --git a/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch b/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch new file mode 100644 index 000000000000..bd82587336c1 --- /dev/null +++ b/sys-power/hibernate-script/files/hibernate-script-2.0-init.d.patch @@ -0,0 +1,56 @@ +diff -Nru hibernate-script-2.0.vanilla/init.d/hibernate-cleanup.sh hibernate-script-2.0/init.d/hibernate-cleanup.sh +--- hibernate-script-2.0.vanilla/init.d/hibernate-cleanup.sh 2009-05-01 23:03:41.000000000 +0100 ++++ hibernate-script-2.0/init.d/hibernate-cleanup.sh 2009-05-01 23:03:55.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/sbin/runscript + + # This script invalidates any stale swsusp and TuxOnIce images. It + # searches all swap partitions on your machine, as well as TuxOnIce's +@@ -91,27 +91,30 @@ + + + msg_status() { +- echo -n "$1" ++ einfon "$1" + } + + msg() { +- echo "$1" ++ einfo "$1" + } + +-case "$1" in +-start) +- msg_status "Invalidating stale software suspend images... " ++opts="reload" ++ ++depend() { ++ after modules ++ before localmount ++} ++ ++start() { ++ ebegin "Invalidating stale software suspend images" + do_start +- msg "done." +- ;; +-stop) ++ eend $? ++} ++ ++stop() { + do_stop +- ;; +-restart|force-reload) +- do_reload +- ;; +-*) +- msg "Usage: /etc/init.d/hibernate {start|stop|restart|force-reload}" +-esac ++} + +-exit 0 ++reload() { ++ do_reload ++} diff --git a/sys-power/hibernate-script/hibernate-script-2.0.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild index 1ad383e88266..f484e5f1f706 100644 --- a/sys-power/hibernate-script/hibernate-script-2.0.ebuild +++ b/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0.ebuild,v 1.1 2009/04/04 11:43:03 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/hibernate-script/hibernate-script-2.0-r1.ebuild,v 1.1 2009/05/01 22:07:29 nelchael Exp $ + +inherit eutils PATCH_VERSION="1" @@ -18,6 +20,13 @@ IUSE="vim-syntax" DEPEND="" RDEPEND="!<media-gfx/splashutils-1.5.2" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-init.d.patch" +} + src_install() { BASE_DIR="${D}" \ DISTRIBUTION="gentoo" \ |