summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2010-04-08 05:59:04 +0200
committermaximilian attems <maks@debian.org>2010-04-08 06:01:34 +0200
commitc797a7af11908e7fdf2bac6380897e45f9f74e2b (patch)
tree5cc312212c08f3003a614c85c2bd4372601315f1
parent062dfde05b2d67a2e2e8766f30847e56dd4c87d2 (diff)
downloadinitramfs-tools-c797a7af11908e7fdf2bac6380897e45f9f74e2b.tar.gz
initramfs-tools-c797a7af11908e7fdf2bac6380897e45f9f74e2b.zip
init: fix hardcoded resume handling
got confused in course of #572858, uppercase is for hardcoded device strings as here, pick up RESUME and not resume from config file. Closes: #576700 Signed-off-by: maximilian attems <maks@debian.org>
-rwxr-xr-xinit4
1 files changed, 3 insertions, 1 deletions
diff --git a/init b/init
index 8083128..7d0db07 100755
--- a/init
+++ b/init
@@ -127,7 +127,7 @@ for x in $(cat /proc/cmdline); do
BOOT=${x#boot=}
;;
resume=*)
- resume="${x#resume=}"
+ RESUME="${x#resume=}"
;;
resume_offset=*)
resume_offset="${x#resume_offset=}"
@@ -181,6 +181,8 @@ done
if [ -n "${noresume}" ]; then
export noresume
unset resume
+else
+ resume=${RESUME:-}
fi
[ -n "${netconsole}" ] && modprobe netconsole netconsole="${netconsole}"