[SCM] Debian Live initramfs hook branch, master, updated. upstream/1.154.8-1-15-gd097498

Daniel Baumann daniel at debian.org
Sun Feb 8 00:17:10 UTC 2009


The following commit has been merged in the master branch:
commit d09749872c03ab51b82bc73d719be660eb9931dd
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 8 01:16:00 2009 +0100

    Correct eject login in initscript.

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index 8b10e90..4cf767a 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -134,21 +134,21 @@ do_stop ()
 	if [ -z ${QUICKREBOOT} ]
 	then
 		# TODO: i18n
-		if [ -x /usr/bin/eject ]
-		then
-			BOOT_DEVICE="$(get_boot_device)"
+		BOOT_DEVICE="$(get_boot_device)"
 
-			if device_is_USB_flash_drive ${BOOT_DEVICE}
+		if device_is_USB_flash_drive ${BOOT_DEVICE}
+		then
+			# do NOT eject USB flash drives!
+			# otherwise rebooting with most USB flash drives
+			# failes because they actually remember the
+			# "ejected" state even after reboot
+			MESSAGE="Please remove the USB flash drive"
+		else
+			# ejecting is a very good idea here
+			MESSAGE="Please remove the disc, close the the tray (if any)"
+
+			if [ -x /usr/bin/eject ]
 			then
-				# do NOT eject USB flash drives!
-				# otherwise rebooting with most USB flash drives
-				# failes because they actually remember the
-				# "ejected" state even after reboot
-				MESSAGE="Please remove the USB flash drive"
-			else
-				# ejecting is a very good idea here
-				MESSAGE="Please remove the disc, close the the tray (if any)"
-
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 

-- 
Debian Live initramfs hook



More information about the debian-live-changes mailing list