[patch] hibernate-script-2.0-USuspendRam-options-for-s2both.patch

hibernate-script-2.0-USuspendRam-options-for-s2both.patch (text/plain), 2.55 KB, created by samLT on 2009-05-07 16:20:29 UTC

diff -Narup hibernate-script-2.0.old/scriptlets.d/ususpend hibernate-script-2.0/scriptlets.d/ususpend
--- hibernate-script-2.0.old/scriptlets.d/ususpend	2009-05-06 18:40:19.680667560 +0200
+++ hibernate-script-2.0/scriptlets.d/ususpend	2009-05-06 19:34:57.466648068 +0200
@@ -33,10 +33,7 @@ USuspendConfigEnabler() {
     case "$1" in
 	ususpendmethod)
 	    case "$2" in
-		disk|both) USUSPEND_PROG=s2$2;;
-		ram)
-		    USUSPEND_PROG=s2ram
-		    ;;
+		both|disk|ram) USUSPEND_PROG=s2$2;;
 		*)
 		    vecho 1 "$EXE: Invalid value fo USuspendMethod."
 		    return 2
@@ -104,7 +101,7 @@ USuspendOptionHandler() {
 DoUSuspend() {
     if [ -z "$USUSPEND_NO_SUSPEND" ] ; then
 	ARGS=
-	if [ "$USUSPEND_PROG" = s2ram ]; then
+	if [ "$USUSPEND_PROG" != s2disk ]; then
 	    [ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force"
 	    [ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save"
 	    [ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post"
@@ -127,8 +124,8 @@ EnsureUSuspendCapable() {
 	vecho 0 "$USUSPEND_PROG not installed."
 	return 2
     fi
-    if [ "$USUSPEND_PROG" = s2ram ] && [ $USUSPEND_RAM_FORCE -eq 0 ]; then
-	$USUSPEND_PROG -n >/dev/null
+    if [ "$USUSPEND_PROG" != s2disk ] && [ $USUSPEND_RAM_FORCE -eq 0 ]; then
+	s2ram -n >/dev/null
 	ret=$?
 	case "$ret/$USUSPEND_RAM_UNSUREOK" in
 	    0/*) :;;
diff -Narup hibernate-script-2.0.old/ususpend-both.conf hibernate-script-2.0/ususpend-both.conf
--- hibernate-script-2.0.old/ususpend-both.conf	2009-05-06 17:56:17.328666183 +0200
+++ hibernate-script-2.0/ususpend-both.conf	2009-05-06 19:32:11.466646838 +0200
@@ -9,4 +9,33 @@
 
 USuspendMethod both
 
+## pass the --force option to s2both (if needed for s2ram)
+# USuspendRamForce yes
+
+## if s2ram is unsure, let it use system-specific options instead of having to
+## force it.
+# USuspendRamUnsureOk yes
+
+## if needed, pass the --vbe_mode option to s2both
+## (--vbe_mode should be used instead of --vbe_save if possible; see
+## https://bugzilla.novell.com/show_bug.cgi?id=229603)
+# USuspendRamVbeMode yes
+
+## if needed, pass the --vbe_save option to s2both
+## (if possible, prefer --vbe_mode to --vbe_save; see above)
+# USuspendRamVbeSave yes
+
+## if needed, pass the --vbe_post option to s2both
+# USuspendRamVbePost yes
+
+## if needed, pass the --acpi_sleep option to s2both
+## (Intel users see: http://en.opensuse.org/S2ram#Intel_Graphics_Chipsets)
+# USuspendRamAcpiSleep 3
+
+## if needed, pass the -pci_save option to s2both
+# USuspendRamPciSave yes
+
+## if needed, pass the --radeontool option to s2both
+# USuspendRamRadeontool yes
+
 Include common.conf