[SCM] live-boot branch, debian-next, updated. debian/3.0_a9-1-2-gdb91edd

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 191a537eadd3e5f32339e5196e2112d3147aefc2
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 27 14:53:38 2010 +0200

    Don't do anything in initscript when using toram (Closes: #601575).

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 9d6bc69..1a85267 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -114,6 +114,12 @@ do_stop ()
 		return 0
 	fi
 
+	# check for toram
+	if grep -qs toram /proc/cmdline
+	then
+		return 0
+	fi
+
 	# Don't prompt to eject the SD card on Babbage board, where we reuse it
 	# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
 	# (archdetect), but since this is mostly only relevant for

-- 
live-boot