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 | |
| parent | 6687b1fbcdb5e2059d17156502a413a8a41c3f68 (diff) | |
| download | live-boot-8967e5c7032f4d7571f0a22609f8627a00954120.tar.gz live-boot-8967e5c7032f4d7571f0a22609f8627a00954120.zip | |
Merging casper 1.227.
| -rw-r--r-- | debian/live-initramfs.init | 24 | ||||
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rw-r--r-- | scripts/live-functions | 6 |
3 files changed, 27 insertions, 10 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 } diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 7a5ba08..a483397 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.227) lucid; urgency=low + + * casper-md5check: port from usplash to plymouth. LP: #500198 + * fix up our reliance on usplash, /dev/console elsewhere. LP: #506418. + + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 12 Mar 2010 01:12:28 -0800 + casper (1.226) lucid; urgency=low [ Colin Watson ] diff --git a/scripts/live-functions b/scripts/live-functions index 4c37f4b..9e138ec 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -5,7 +5,11 @@ log_wait_msg () { # Print a message and wait for enter - if [ -x /sbin/usplash_write ] + if [ -x /bin/plymouth ] && plymouth --ping + then + plymouth message --text="$@" + plymouth watch-keystroke | read nunya + elif [ -x /sbin/usplash_write ] then /sbin/usplash_write "INPUTENTER ${@}" read nunya < /dev/.initramfs/usplash_outfifo |