From: intrigeri <intrigeri@boum.org>
Date: Mon, 19 Oct 2009 18:34:32 +0000 (+0200)
Subject: Taking noprompt into account for USB flash drives as well.
X-Git-Tag: debian/1.173.1-1~38
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=e1e3850fdff9898fc1a22841bf71ff5dfdbcadde;p=live-boot-grml.git

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::