Releasing debian version 3.0~a3-1.

[live-boot-grml.git] / debian / live-boot.init

diff --git a/debian/live-boot.init b/debian/live-boot.init
index cefa59b..12d0f94 100644 (file)
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -21,13 +21,12 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 NAME=live-boot
 SCRIPTNAME=/etc/init.d/${NAME}
 DO_SNAPSHOT=/sbin/live-snapshot
-SNAPSHOT_CONF="/etc/live/boot.d/snapshot.conf"
 
 # Exit if system was not booted by live-boot
 grep -qs boot=live /proc/cmdline || exit 0
 
-# Read snapshot configuration variables
-[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
+# Read configuration variable file if it is present
+[ -r /etc/live.conf ] && . /etc/live.conf
 
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
@@ -97,7 +96,6 @@ do_stop ()
 {
        if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
        then
-               # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
                if [ ! -z "${ROOTSNAP}" ]
                then
                        ${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
@@ -136,7 +134,7 @@ do_stop ()
                prompt=
        fi
 
-       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
+       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
        do
                cache_path "${path}"
        done
@@ -187,6 +185,13 @@ do_stop ()
 
                        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
+
                        read x < /dev/console
                fi
        fi