summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-10-19 20:34:32 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commit605e7fad72bdf94f15587c7824fb4ea977c8e4a3 (patch)
tree418a0d70a08a8b2e00452c88bd6c04d75a2d78ba
parent2375825c9bd850667e8e0cacc867a3c14421ab5e (diff)
downloadlive-boot-605e7fad72bdf94f15587c7824fb4ea977c8e4a3.tar.gz
live-boot-605e7fad72bdf94f15587c7824fb4ea977c8e4a3.zip
Taking noprompt into account for USB flash drives as well.
-rw-r--r--debian/live-initramfs.init3
-rw-r--r--manpages/live-initramfs.en.7.txt2
2 files changed, 3 insertions, 2 deletions
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::