From aaf9b600c8ed9055b4e283e6cf1394b6f9f6ac8e Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Mon, 7 Apr 2008 11:51:00 +0200 Subject: 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 . Bonus small codingstyle clean up of local-premount/resume. --- init | 4 ++++ scripts/local-premount/resume | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/init b/init index 3a93ef8..70f4384 100755 --- a/init +++ b/init @@ -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 -- cgit v1.2.3