[SCM] live-initramfs branch, master, updated. 1.157.4-1-2-gf464430

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d2fef3943ceffa1ec11c1114986d7ee6532fddbe
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Oct 19 20:34:32 2009 +0200

    Taking noprompt into account for USB flash drives as well.

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index 3204924..5c79401 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -161,9 +161,10 @@ do_stop ()
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 
-			[ "$prompt" ] || return 0
 		fi
 
+		[ "$prompt" ] || return 0
+
 		stty sane < /dev/console
 
 		printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 4a70f27..f68e87c 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -192,7 +192,7 @@ been installed with persistent enabled.
 
   noprompt
 
-Do not prompt to eject the CD on reboot.
+Do not prompt to eject the CD or remove the USB flash drive on reboot.
 
   nosudo::
 

-- 
live-initramfs