diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 14:04:49 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | 8967e5c7032f4d7571f0a22609f8627a00954120 (patch) | |
| tree | 1df44681e248015a81c09884a6f8f22cdef8fb56 /debian | |
| parent | 6687b1fbcdb5e2059d17156502a413a8a41c3f68 (diff) | |
| download | live-boot-8967e5c7032f4d7571f0a22609f8627a00954120.tar.gz live-boot-8967e5c7032f4d7571f0a22609f8627a00954120.zip | |
Merging casper 1.227.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/live-initramfs.init | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init index 92e42b3..da461b5 100644 --- a/debian/live-initramfs.init +++ b/debian/live-initramfs.init @@ -176,18 +176,24 @@ do_stop () [ "$prompt" ] || return 0 - stty sane < /dev/console + if [ -x /bin/plymouth ] && plymouth --ping + then + plymouth message --text="${MESSAGE} and press ENTER to continue:" + plymouth watch-keystroke > /dev/null + else + stty sane < /dev/console - printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console + printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "TIMEOUT 86400" - /sbin/usplash_write "TEXT-URGENT ${MESSAGE}" - /sbin/usplash_write "TEXT-URGENT and press ENTER to continue" - fi + if [ -x /sbin/usplash_write ] + then + /sbin/usplash_write "TIMEOUT 86400" + /sbin/usplash_write "TEXT-URGENT ${MESSAGE}" + /sbin/usplash_write "TEXT-URGENT and press ENTER to continue" + fi - read x < /dev/console + read x < /dev/console + fi fi } |