Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 197630 | Differences between
and this patch

Collapse All | Expand All

(-)suspend2 (-6 / +3 lines)
Lines 211-218 Link Here
211
		vecho 0 "$EXE: Filewriter size is not numeric!"
211
		vecho 0 "$EXE: Filewriter size is not numeric!"
212
		exit 1
212
		exit 1
213
	    fi
213
	    fi
214
	    AddSuspendHook 06 Swsusp2SetupFilewriter
214
	    AddSuspendHook 11 Swsusp2SetupFilewriter
215
	    AddResumeHook 06 Swsusp2CleanupFilewriter
215
	    AddResumeHook 11 Swsusp2CleanupFilewriter
216
	    ;;
216
	    ;;
217
	verifyfilewriterresume2)
217
	verifyfilewriterresume2)
218
	    BoolIsOn "$1" "$2" && return 0
218
	    BoolIsOn "$1" "$2" && return 0
Lines 691-697 Link Here
691
    read REPLY < $SWSUSP_ROOT/$RESUME2_FILE
691
    read REPLY < $SWSUSP_ROOT/$RESUME2_FILE
692
    if [ -z "$REPLY" ] ; then
692
    if [ -z "$REPLY" ] ; then
693
	cat <<EOT
693
	cat <<EOT
694
You haven't specified a resume2= parameter on your kernel command line
694
You haven't specified a resume=/resume2= parameter on your kernel command line
695
695
696
Your GRUB or LILO config should have something like $RESUME2_FILE=swap:/dev/hdaX
696
Your GRUB or LILO config should have something like $RESUME2_FILE=swap:/dev/hdaX
697
where /dev/hdaX is your swap partition. You will then need to either reboot
697
where /dev/hdaX is your swap partition. You will then need to either reboot
Lines 800-808 Link Here
800
    echo "$SWSUSP_FILEWRITER_LOC" > $HIBERNATE_FILEWRITER_TRAIL
800
    echo "$SWSUSP_FILEWRITER_LOC" > $HIBERNATE_FILEWRITER_TRAIL
801
    chmod 600 $HIBERNATE_FILEWRITER_TRAIL
801
    chmod 600 $HIBERNATE_FILEWRITER_TRAIL
802
802
803
    # Don't overwrite the resume2 line now.
804
    SWSUSP_RESUME2="$new_resume2"
805
806
    # Now verify our resume2 is correct unless told otherwise.
803
    # Now verify our resume2 is correct unless told otherwise.
807
    [ x"$SWSUSP_FILEWRITER_NOVERIFY" = "x1" ] && return 0
804
    [ x"$SWSUSP_FILEWRITER_NOVERIFY" = "x1" ] && return 0
808
805

Return to bug 197630