[SCM] live-config branch, debian-next, updated. debian/3.0_b1-1-1-g08bcb3e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 08bcb3e2e767ca6c5dec0e2cb928e9c24635bcb6
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 26 16:26:12 2012 +0200

    Simplyfing find_iso eject check in boot initscript.

diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index 8e98efd..5e117f7 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -95,8 +95,6 @@ device_is_USB_flash_drive()
 
 Eject ()
 {
-	# 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)"
 
@@ -175,7 +173,8 @@ mount -o remount,ro /live/overlay > /dev/null 2>&1
 
 # Check if we need to eject the drive
 if grep -qs "cdrom-detect/eject=false" /proc/cmdline || \
-   grep -qs "noeject" /proc/cmdline
+   grep -qs "noeject" /proc/cmdline || \
+   grep -qs "find_iso" /proc/cmdline
 then
 	return
 else

-- 
live-config