summaryrefslogtreecommitdiff
path: root/scripts/live-functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 14:04:49 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:09 +0100
commit8967e5c7032f4d7571f0a22609f8627a00954120 (patch)
tree1df44681e248015a81c09884a6f8f22cdef8fb56 /scripts/live-functions
parent6687b1fbcdb5e2059d17156502a413a8a41c3f68 (diff)
downloadlive-boot-8967e5c7032f4d7571f0a22609f8627a00954120.tar.gz
live-boot-8967e5c7032f4d7571f0a22609f8627a00954120.zip
Merging casper 1.227.
Diffstat (limited to 'scripts/live-functions')
-rw-r--r--scripts/live-functions6
1 files changed, 5 insertions, 1 deletions
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