From c797a7af11908e7fdf2bac6380897e45f9f74e2b Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Thu, 8 Apr 2010 05:59:04 +0200 Subject: 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 --- init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'init') 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}" -- cgit v1.2.3