diff options
| author | maximilian attems <max@stro.at> | 2008-04-07 11:51:00 +0200 | 
|---|---|---|
| committer | maximilian attems <max@stro.at> | 2008-04-07 11:51:00 +0200 | 
| commit | aaf9b600c8ed9055b4e283e6cf1394b6f9f6ac8e (patch) | |
| tree | 75697af4f5764d2b279b1665c01e6360fdc582cb | |
| parent | c1fd9aa6213613fed140da7fe68c67a91f478509 (diff) | |
| download | initramfs-tools-aaf9b600c8ed9055b4e283e6cf1394b6f9f6ac8e.tar.gz initramfs-tools-aaf9b600c8ed9055b4e283e6cf1394b6f9f6ac8e.zip | |
resume: Add support for resume_offset swap file suspend to disk.
Parse cmdline for resume_offset, export it and pass it to
the klibc resume binary.
Based on a patch by Alan Jenkins <alan-jenkins@tuffmail.co.uk>.
Bonus small codingstyle clean up of local-premount/resume.
| -rwxr-xr-x | init | 4 | ||||
| -rwxr-xr-x | scripts/local-premount/resume | 12 | 
2 files changed, 11 insertions, 5 deletions
| @@ -50,6 +50,7 @@ export rootmnt=/root  export debug=  export panic=  export blacklist= +export resume_offset=  # Parse command line options  for x in $(cat /proc/cmdline); do @@ -97,6 +98,9 @@ for x in $(cat /proc/cmdline); do  	resume=*)  		RESUME="${x#resume=}"  		;; +	resume_offset=*) +		resume_offset="${x#resume_offset=}" +		;;  	noresume)  		noresume=y  		;; diff --git a/scripts/local-premount/resume b/scripts/local-premount/resume index d997f81..6bf95e5 100755 --- a/scripts/local-premount/resume +++ b/scripts/local-premount/resume @@ -28,11 +28,13 @@ case $resume in  	;;  esac -if [ ! -e "${resume}" ]; then -	exit 0 -fi +[ ! -e "${resume}" ] && exit 0 + +[ ! -e /sys/power/resume ] && exit 0 -if [ -e /sys/power/resume ]; then -	# hardcode path, uswsusp ships an resume binary too +# hardcode path, uswsusp ships an resume binary too +if [ -n "${resume_offset}" ]; then +	/bin/resume ${resume} ${resume_offset} +else  	/bin/resume ${resume}  fi | 
