diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-10-09 00:33:04 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | b9f1a7fdf6528f3af7ed94af70cdd2567351ca2d (patch) | |
| tree | baa2c3660c2e638ac7be584194fd8bd872c7aa4a /debian/init | |
| parent | e10059ad3f5f97ae43d46eb5ef6386e3f561f14f (diff) | |
| download | live-boot-b9f1a7fdf6528f3af7ed94af70cdd2567351ca2d.tar.gz live-boot-b9f1a7fdf6528f3af7ed94af70cdd2567351ca2d.zip | |
Merging casper 1.109.
Diffstat (limited to 'debian/init')
| -rw-r--r-- | debian/init | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/init b/debian/init index a24fe9f..d59ed45 100644 --- a/debian/init +++ b/debian/init @@ -68,7 +68,12 @@ do_stop () return 0 fi - for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do + prompt=1 + if grep -qs noprompt /proc/cmdline; then + prompt= + fi + + for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty); do cache_path "${path}" done @@ -84,6 +89,8 @@ do_stop () if [ -x /usr/bin/eject ] then eject -p -m /live/image >/dev/null 2>&1 + + [ "$prompt" ] || return 0 fi stty sane < /dev/console |