Some changes (at least wipe resume image securely even without TuxOnIce)

svn path=/nixos/trunk/; revision=10881

boot/boot-stage-1-init.sh

@@ -70,7 +70,8 @@ if test -n "$(cat /sys/power/tuxonice/resume)"; then
     echo 0 > /sys/power/tuxonice/user_interface/enabled
     echo 1 > /sys/power/tuxonice/do_resume || echo "Failed to resume..."
 fi
-
+    echo 1 > /sys/power/resume || echo "Failed to resume..."
+    echo shutdown >/sys/power/disk
 
 # Create device nodes in /dev.
 mknod -m 0666 /dev/null c 1 3

boot/boot-stage-2-init.sh

@@ -108,7 +108,10 @@ export MODULE_DIR=@kernel@/lib/modules/
 # Run any user-specified commands.
 @shell@ @bootLocal@
 
-resumeDevice="$(cat /sys/power/tuxonice/resume)"
+resumeDevice="$(cat /proc/cmdline)"
+resumeDevice="${resumeDevice##* resume=}"
+resumeDevice="${resumeDevice%% *}"
+echo "$resumeDevice"
 if test -n "$resumeDevice"; then
     mkswap "$resumeDevice" || echo 'Failed to clear saved image.'
 fi