summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-07-15 20:15:51 +0000
committerChristian Heim <phreak@gentoo.org>2006-07-15 20:15:51 +0000
commita815318a33374ae490e138f0eb214aaf2e100e0f (patch)
treef465ebc7d94a52a400ccda971359c7cda558cefd /sys-power/hibernate-script/files
parentMerge handling of login.defs (fixing #140451 along the way) and cut out old/d... (diff)
downloadgentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.tar.gz
gentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.tar.bz2
gentoo-2-a815318a33374ae490e138f0eb214aaf2e100e0f.zip
Adding a patch to fix #140512 (thanks to Marek Szuba <cyberman at if.pw.edu.pl> for the patch)
(Portage version: 2.1.1_pre2-r8)
Diffstat (limited to 'sys-power/hibernate-script/files')
-rw-r--r--sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch2
-rw-r--r--sys-power/hibernate-script/files/hibernate-script-1.93-return.patch11
2 files changed, 12 insertions, 1 deletions
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch
index be74ba32ed00..b1cdec0de1a5 100644
--- a/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch
+++ b/sys-power/hibernate-script/files/hibernate-script-1.93-gentoo.patch
@@ -34,5 +34,5 @@ Index: hibernate-script-1.93/init.d/hibernate-cleanup.sh
+ ebegin "Clearing Software Suspend 2 signatures"
+ check_swap_sig
+ check_filewriter_sig
-+ eend
++ eend $?
+}
diff --git a/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch b/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch
new file mode 100644
index 000000000000..655b10fab352
--- /dev/null
+++ b/sys-power/hibernate-script/files/hibernate-script-1.93-return.patch
@@ -0,0 +1,11 @@
+--- hibernate-script-1.93/init.d/hibernate-cleanup.sh 2006-07-12 06:15:43.000000000 -0400
++++ hibernate-script-1.93-fwreturn/init.d/hibernate-cleanup.sh 2006-07-15 12:17:41.000000000 -0400
+@@ -55,7 +55,7 @@
+
+ check_filewriter_sig() {
+ local target
+- [ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return
++ [ -f "$HIBERNATE_FILEWRITER_TRAIL" ] || return 0
+ read target < $HIBERNATE_FILEWRITER_TRAIL
+ [ -f "$target" ] || return
+ case "`dd \"if=$target\" bs=8 count=1 2>/dev/null`" in