diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2010-04-18 12:34:58 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2010-04-18 12:34:58 +0000 |
| commit | 0d3da8940279d200068d2ec01556c0ce4d9bb9eb (patch) | |
| tree | 45cf07ed53a6baff09ab5fc62e1e16fc73177831 /src/patchsets/hibernate-script | |
| parent | remove retired devs and devs not responding to herd pings from apache (diff) | |
| download | gentoo-0d3da8940279d200068d2ec01556c0ce4d9bb9eb.tar.gz gentoo-0d3da8940279d200068d2ec01556c0ce4d9bb9eb.tar.bz2 gentoo-0d3da8940279d200068d2ec01556c0ce4d9bb9eb.zip | |
Add patches for hibernate-script.
Diffstat (limited to 'src/patchsets/hibernate-script')
| -rw-r--r-- | src/patchsets/hibernate-script/2.0/hibernate-script-2.0-init.d.patch | 56 | ||||
| -rw-r--r-- | src/patchsets/hibernate-script/2.0/hibernate-script-2.0-single-conf-read.patch | 18 |
2 files changed, 74 insertions, 0 deletions
diff --git a/src/patchsets/hibernate-script/2.0/hibernate-script-2.0-init.d.patch b/src/patchsets/hibernate-script/2.0/hibernate-script-2.0-init.d.patch new file mode 100644 index 0000000000..bd82587336 --- /dev/null +++ b/src/patchsets/hibernate-script/2.0/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/src/patchsets/hibernate-script/2.0/hibernate-script-2.0-single-conf-read.patch b/src/patchsets/hibernate-script/2.0/hibernate-script-2.0-single-conf-read.patch new file mode 100644 index 0000000000..25f2acb73c --- /dev/null +++ b/src/patchsets/hibernate-script/2.0/hibernate-script-2.0-single-conf-read.patch @@ -0,0 +1,18 @@ +diff -Nru hibernate-script-2.0.vanilla/hibernate.sh hibernate-script-2.0/hibernate.sh +--- hibernate-script-2.0.vanilla/hibernate.sh 2010-04-18 13:06:49.653466081 +0100 ++++ hibernate-script-2.0/hibernate.sh 2010-04-18 13:27:09.566460136 +0100 +@@ -713,11 +713,13 @@ + fi + fi + +- if [ "${conffiles_read#*$file_name}" != "$conffiles_read" ]; then ++ if [ -n "$(echo ${conffiles_read} | grep ${file_name})" ]; then + vecho 2 "$EXE: Skipping already included config file $file_name" + return 0 + fi + ++ conffiles_read="${conffiles_read} ${file_name}" ++ + while true ; do + # Doing the read this way allows means we don't require a new-line + # at the end of the file. |