[SCM] Debian Live initramfs hook branch, master, updated. 1.139.1-4-21-gb62a7bf

[Daniel Baumann]

The following commit has been merged in the master branch:
commit b62a7bf5662845d2e65e77e8886f0661468b3e47
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Nov 24 12:27:04 2008 +0100

    Ejecting live media when booting with toram. Can be disabled with optional 'noeject' boot parameter (Closes: #457070).

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index de8a67c..c48e9ec 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -164,6 +164,11 @@ This parameter disables the automatic terminal login only, not touching gdk/kdm.
 This parameter disables the automatic login of gdm/kdm only, not touching
 terminals.
 
+  noeject::
+
+This parameter disable the automatical ejection of the live media when using
+toram bootparameter to copy live system into RAM.
+
   nofastboot::
 
 This parameter disables the default disabling of filesystem checks in
diff --git a/scripts/live b/scripts/live
index 389fc21..efe48f3 100755
--- a/scripts/live
+++ b/scripts/live
@@ -236,6 +236,11 @@ Arguments ()
 				export NOCONSOLEKEYBOARD
 				;;
 
+			noeject)
+				NOEJECT="Yes"
+				export NOEJECT
+				;;
+
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -662,6 +667,12 @@ copy_live_to ()
 		mount -r -o move ${copyto} ${copyfrom}
 	fi
 
+	# Eject live media
+	if [ -x /bin/eject ] && [ "${NOEJECT}" != "Yes" ]
+	then
+		eject /dev/${devname}
+	fi
+
 	rmdir ${copyto}
 	return 0
 }
@@ -1382,6 +1393,7 @@ find_livefs ()
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 	do
 		devname=$(sys2dev "${sysblock}")
+		export devname sysblock
 		fstype=$(get_fstype "${devname}")
 
 		if /lib/udev/cdrom_id ${devname} > /dev/null

-- 
Debian Live initramfs hook