Attachment #190521 for bug #268133




    case "$1" in
	ususpendmethod)
	    case "$2" in
		both|disk|ram) USUSPEND_PROG=s2$2;;
		ram)
		    USUSPEND_PROG=s2ram
		    ;;
		*)
		    vecho 1 "$EXE: Invalid value fo USuspendMethod."
		    return 2

DoUSuspend() {
    if [ -z "$USUSPEND_NO_SUSPEND" ] ; then
	ARGS=
	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"

	vecho 0 "$USUSPEND_PROG not installed."
	return 2
    fi
    if [ "$USUSPEND_PROG" != s2disk ] && [ $USUSPEND_RAM_FORCE -eq 0 ]; then
	s2both -n >/dev/null
	ret=$?
	case "$ret/$USUSPEND_RAM_UNSUREOK" in
	    0/*) :;;





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

Return to bug 268133

Lines 33-42 USuspendConfigEnabler() { Link Here

(-)hibernate-script-2.0.old/scriptlets.d/ususpend (-7 / +4 lines)
33	case "$1" in	33	case "$1" in
34	ususpendmethod)	34	ususpendmethod)
35	case "$2" in	35	case "$2" in
36	disk\|both) USUSPEND_PROG=s2$2;;	36	both\|disk\|ram) USUSPEND_PROG=s2$2;;
37	ram)
38	USUSPEND_PROG=s2ram
39	;;
40	*)	37	*)
41	vecho 1 "$EXE: Invalid value fo USuspendMethod."	38	vecho 1 "$EXE: Invalid value fo USuspendMethod."
42	return 2	39	return 2
Lines 104-110 USuspendOptionHandler() { Link Here
104	DoUSuspend() {	101	DoUSuspend() {
105	if [ -z "$USUSPEND_NO_SUSPEND" ] ; then	102	if [ -z "$USUSPEND_NO_SUSPEND" ] ; then
106	ARGS=	103	ARGS=
107	if [ "$USUSPEND_PROG" = s2ram ]; then	104	if [ "$USUSPEND_PROG" != s2disk ]; then
108	[ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force"	105	[ $USUSPEND_RAM_FORCE -eq 1 ] && ARGS="$ARGS --force"
109	[ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save"	106	[ $USUSPEND_RAM_VBESAVE -eq 1 ] && ARGS="$ARGS --vbe_save"
110	[ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post"	107	[ $USUSPEND_RAM_VBEPOST -eq 1 ] && ARGS="$ARGS --vbe_post"
Lines 127-134 EnsureUSuspendCapable() { Link Here
127	vecho 0 "$USUSPEND_PROG not installed."	124	vecho 0 "$USUSPEND_PROG not installed."
128	return 2	125	return 2
129	fi	126	fi
130	if [ "$USUSPEND_PROG" = s2ram ] && [ $USUSPEND_RAM_FORCE -eq 0 ]; then	127	if [ "$USUSPEND_PROG" != s2disk ] && [ $USUSPEND_RAM_FORCE -eq 0 ]; then
131	$USUSPEND_PROG -n >/dev/null	128	s2both -n >/dev/null
132	ret=$?	129	ret=$?
133	case "$ret/$USUSPEND_RAM_UNSUREOK" in	130	case "$ret/$USUSPEND_RAM_UNSUREOK" in
134	0/*) :;;	131	0/*) :;;

Lines 9-12 Link Here

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