Attachment #190520 for bug #268133




AddOptionHandler USuspendOptionHandler

AddConfigHelp "USuspendMethod <disk|ram|both>" "Enables use of the uswsusp suspend method of newer kernels (>= 2.6.17rc1)"
AddConfigHelp "USuspendRamForce <boolean>" "Passes the --force flag to s2ram/s2both to force suspending even if the machine is not recognised"
AddConfigHelp "USuspendRamUnsureOk <boolean>" "Instructs s2ram/s2both to continue when it's unsure about the system type, thus not requiring --force to be passed"
AddConfigHelp "USuspendRamVbeSave <boolean>" "Passes the --vbe_save flag to s2ram/s2both to save VBE state before suspending and restore after resume"
AddConfigHelp "USuspendRamVbePost <boolean>" "Passes the --vbe_post flag to s2ram/s2both to VBE POST the graphics card after resume"
AddConfigHelp "USuspendRamVbeMode <boolean>" "Passes the --vbe_mode flag to s2ram/s2both to get VBE mode before suspend and set it after resume"
AddConfigHelp "USuspendRamRadeontool <boolean>" "Passes the --radeontool flag to s2ram/s2both to let radeontool turn of the backlight before suspending."
AddConfigHelp "USuspendRamAcpiSleep <number>" "Passes the --acpi_sleep flag to s2ram/s2both to set the acpi_sleep parameter before suspend: 1=s3_bios, 2=s3_mode, 3=both"
AddConfigHelp "USuspendRamPciSave <boolean>" "Passes the --pci_save flag to s2ram/s2both to have the PCI config space of the VGA card before suspend, and restore it on resume"

AddShortOption "n"
AddLongOption "no-suspend"

    if [ -z "$USUSPEND_NO_SUSPEND" ] ; then
	ARGS=
	if [ "$USUSPEND_PROG" = s2ram ]; 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"
	    [ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS --radeontool"
	    [ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS --vbe_mode"
	    [ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS --acpi_sleep $USUSPEND_RAM_ACPISLEEP"
	    [ $USUSPEND_RAM_PCISAVE -eq 1 ] && ARGS="$ARGS --pci_save"
	fi
	vecho 1 "$EXE: Running $USUSPEND_PROG_PATH $ARGS..."
	$USUSPEND_PROG_PATH $ARGS 2>&1 | vcat 2 \





USuspendMethod ram

## if needed, pass the --force option to 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 s2ram
## (--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 s2ram
## (if possible, prefer --vbe_mode to --vbe_save; see above)
# USuspendRamVbeSave yes

## if needed, pass the --vbe_post option to s2ram
# USuspendRamVbePost yes

## if needed, pass the --acpi_sleep option to s2ram
## (Intel users see: http://en.opensuse.org/S2ram#Intel_Graphics_Chipsets)
# USuspendRamAcpiSleep 3

## if needed, pass the -pci_save option to s2ram
# USuspendRamPciSave yes

## if needed, pass the --radeontool option to s2ram
# USuspendRamRadeontool yes

Include common.conf

Return to bug 268133

Lines 9-41 Link Here

(-)hibernate-script-2.0.old/ususpend-ram.conf (-9 / +9 lines)
9		9
10	USuspendMethod ram	10	USuspendMethod ram
11		11
12	## if needed, pass the -f option to s2ram	12	## if needed, pass the --force option to s2ram
13	# USuspendRamForce yes	13	# USuspendRamForce yes
14		14
15	## if s2ram is unsure, let it use system-specific options instead of having to	15	## if s2ram is unsure, let it use system-specific options instead of having to
16	## force it.	16	## force it.
17	# USuspendRamUnsureOk yes	17	# USuspendRamUnsureOk yes
18		18
19	## if needed, pass the -m option to s2ram	19	## if needed, pass the --vbe_mode option to s2ram
20	## (-m should be used instead of -s, if possible; see	20	## (--vbe_mode should be used instead of --vbe_save if possible; see
21	## https://bugzilla.novell.com/show_bug.cgi?id=229603)	21	## https://bugzilla.novell.com/show_bug.cgi?id=229603)
22	# USuspendRamVbeMode yes	22	# USuspendRamVbeMode yes
23		23
24	## if needed, pass the -s option to s2ram	24	## if needed, pass the --vbe_save option to s2ram
25	## (if possible, prefer -m to -s; see above)	25	## (if possible, prefer --vbe_mode to --vbe_save; see above)
26	# USuspendRamVbeSave yes	26	# USuspendRamVbeSave yes
27		27
28	## if needed, pass the -p option to s2ram	28	## if needed, pass the --vbe_post option to s2ram
29	# USuspendRamVbePost yes	29	# USuspendRamVbePost yes
30		30
31	## if needed, pass the -a option to s2ram	31	## if needed, pass the --acpi_sleep option to s2ram
32	## (Intel users see: http://en.opensuse.org/S2ram#Intel_Graphics_Chipsets)	32	## (Intel users see: http://en.opensuse.org/S2ram#Intel_Graphics_Chipsets)
33	# USuspendRamAcpiSleep 3	33	# USuspendRamAcpiSleep 3
34		34
35	## if needed, pass the -v option to s2ram	35	## if needed, pass the -pci_save option to s2ram
36	# USuspendRamPciSave yes	36	# USuspendRamPciSave yes
37		37
38	## if needed, pass the -r option to s2ram	38	## if needed, pass the --radeontool option to s2ram
39	# USuspendRamRadeontool yes	39	# USuspendRamRadeontool yes
40		40
41	Include common.conf	41	Include common.conf

Lines 5-18 AddConfigHandler USuspendConfigEnabler Link Here

(-)hibernate-script-2.0.old/scriptlets.d/ususpend (-15 / +15 lines)
5	AddOptionHandler USuspendOptionHandler	5	AddOptionHandler USuspendOptionHandler
6		6
7	AddConfigHelp "USuspendMethod <disk\|ram\|both>" "Enables use of the uswsusp suspend method of newer kernels (>= 2.6.17rc1)"	7	AddConfigHelp "USuspendMethod <disk\|ram\|both>" "Enables use of the uswsusp suspend method of newer kernels (>= 2.6.17rc1)"
8	AddConfigHelp "USuspendRamForce <boolean>" "Passes the -f flag to s2ram to force suspending even if the machine is not recognised"	8	AddConfigHelp "USuspendRamForce <boolean>" "Passes the --force flag to s2ram/s2both to force suspending even if the machine is not recognised"
9	AddConfigHelp "USuspendRamUnsureOk <boolean>" "Instructs s2ram to continue when it's unsure about the system type, thus not requiring -f to be passed"	9	AddConfigHelp "USuspendRamUnsureOk <boolean>" "Instructs s2ram/s2both to continue when it's unsure about the system type, thus not requiring --force to be passed"
10	AddConfigHelp "USuspendRamVbeSave <boolean>" "Passes the -s flag to s2ram to save VBE state before suspending and restore after resume"	10	AddConfigHelp "USuspendRamVbeSave <boolean>" "Passes the --vbe_save flag to s2ram/s2both to save VBE state before suspending and restore after resume"
11	AddConfigHelp "USuspendRamVbePost <boolean>" "Passes the -p flag to s2ram to VBE POST the graphics card after resume"	11	AddConfigHelp "USuspendRamVbePost <boolean>" "Passes the --vbe_post flag to s2ram/s2both to VBE POST the graphics card after resume"
12	AddConfigHelp "USuspendRamVbeMode <boolean>" "Passes the -m flag to s2ram to get VBE mode before suspend and set it after resume"	12	AddConfigHelp "USuspendRamVbeMode <boolean>" "Passes the --vbe_mode flag to s2ram/s2both to get VBE mode before suspend and set it after resume"
13	AddConfigHelp "USuspendRamRadeontool <boolean>" "Passes the -r flag to s2ram to let radeontool turn of the backlight before suspending."	13	AddConfigHelp "USuspendRamRadeontool <boolean>" "Passes the --radeontool flag to s2ram/s2both to let radeontool turn of the backlight before suspending."
14	AddConfigHelp "USuspendRamAcpiSleep <number>" "Passes the -a flag to s2ram to set the acpi_sleep parameter before suspend: 1=s3_bios, 2=s3_mode, 3=both"	14	AddConfigHelp "USuspendRamAcpiSleep <number>" "Passes the --acpi_sleep flag to s2ram/s2both to set the acpi_sleep parameter before suspend: 1=s3_bios, 2=s3_mode, 3=both"
15	AddConfigHelp "USuspendRamPciSave <boolean>" "Passes the -v flag to s2ram to have the PCI config space of the VGA card before suspend, and restore it on resume"	15	AddConfigHelp "USuspendRamPciSave <boolean>" "Passes the --pci_save flag to s2ram/s2both to have the PCI config space of the VGA card before suspend, and restore it on resume"
16		16
17	AddShortOption "n"	17	AddShortOption "n"
18	AddLongOption "no-suspend"	18	AddLongOption "no-suspend"
Lines 105-117 DoUSuspend() { Link Here
105	if [ -z "$USUSPEND_NO_SUSPEND" ] ; then	105	if [ -z "$USUSPEND_NO_SUSPEND" ] ; then
106	ARGS=	106	ARGS=
107	if [ "$USUSPEND_PROG" = s2ram ]; then	107	if [ "$USUSPEND_PROG" = s2ram ]; then
108	[ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS -f"	108	[ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force"
109	[ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS -s"	109	[ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save"
110	[ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS -p"	110	[ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post"
111	[ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS -r"	111	[ $USUSPEND_RAM_RADEONTOOL -eq 1 ] && ARGS="$ARGS --radeontool"
112	[ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS -m"	112	[ $USUSPEND_RAM_VBEMODE -eq 1 ] && ARGS="$ARGS --vbe_mode"
113	[ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS -a $USUSPEND_RAM_ACPISLEEP"	113	[ $USUSPEND_RAM_ACPISLEEP -ne 0 ] && ARGS="$ARGS --acpi_sleep $USUSPEND_RAM_ACPISLEEP"
114	[ $USUSPEND_RAM_PCISAVE -eq 1 ] && ARGS="$ARGS -v"	114	[ $USUSPEND_RAM_PCISAVE -eq 1 ] && ARGS="$ARGS --pci_save"
115	fi	115	fi
116	vecho 1 "$EXE: Running $USUSPEND_PROG_PATH $ARGS..."	116	vecho 1 "$EXE: Running $USUSPEND_PROG_PATH $ARGS..."
117	$USUSPEND_PROG_PATH $ARGS 2>&1 \| vcat 2 \	117	$USUSPEND_PROG_PATH $ARGS 2>&1 \| vcat 2 \