Adding upstream version 1.236.1.

[live-boot-grml.git] / scripts / live-functions

diff --git a/scripts/live-functions b/scripts/live-functions
index 4a23e69..9e138ec 100644 (file)
--- 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
@@ -111,3 +115,16 @@ panic() {
        . /scripts/functions
        panic "$@"
 }
+
+load_confmodule ()
+{
+       # Only do this once
+       if [ -z "$DEBCONF_REDIR" ]
+       then
+               exec <&4
+               export DEBIAN_HAS_FRONTEND=1
+               export DEBCONF_REDIR=1
+       fi
+
+       . /root/usr/share/debconf/confmodule
+}