From 1277b2e7590a3a1354440472da497b68e8ba5385 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 8 Mar 2010 22:06:39 +0100
Subject: init: rexport resume to reallow it's hardcoded usage

as bonus also simplify the noresume case, just unset it in that case.

this should fix #572858 and friends,
looks broken to me in Lenny too.

Signed-off-by: maximilian attems <maks@debian.org>
---
 init | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'init')

diff --git a/init b/init
index 234c3e5..e1d4151 100755
--- a/init
+++ b/init
@@ -45,6 +45,7 @@ export rootmnt=/root
 export debug=
 export panic=
 export blacklist=
+export resume=
 export resume_offset=
 
 # Bring in the main config
@@ -121,7 +122,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=}"
@@ -169,10 +170,9 @@ for x in $(cat /proc/cmdline); do
 	esac
 done
 
-if [ -z "${noresume}" ]; then
-	export resume=${RESUME}
-else
+if [ -n "${noresume}" ]; then
 	export noresume
+	unset resume
 fi
 
 depmod -a
-- 
cgit v1.2.3