[SCM] live-boot branch, debian-next, updated. debian/2.0_a5-1-7-g37553ae

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit aa63de5569e7b25017d35a293e29a3f7ddd0c737
Author: Michal Suchanek <hramrach at centrum.cz>
Date:   Mon Jun 7 15:12:17 2010 +0200

    Moving check for iso image in initscript from the start to the end before ejecting media.

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 298295d..bb079ee 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -25,9 +25,6 @@ DO_SNAPSHOT=/sbin/live-snapshot
 # Exit if system was not booted by live-boot
 grep -qs boot=live /proc/cmdline || exit 0
 
-# Exit if the system was booted from an ISO image rather than a physical CD
-grep -qs find_iso= /proc/cmdline && exit 0
-
 # Read configuration variable file if it is present
 [ -r /etc/live.conf ] && . /etc/live.conf
 
@@ -153,6 +150,9 @@ do_stop ()
 
 	if [ -z ${QUICKREBOOT} ]
 	then
+
+		# Exit if the system was booted from an ISO image rather than a physical CD
+		grep -qs find_iso= /proc/cmdline && return 0
 		# TODO: i18n
 		BOOT_DEVICE="$(get_boot_device)"
 

-- 
live-boot