Adding patch from Colin Watson <cjwatson@ubuntu.com> to follow symlinks when checking...

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

diff --git a/debian/live-boot.init b/debian/live-boot.init
index c8c4820..63b07f0 100644 (file)
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -21,12 +21,13 @@ 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 configuration variable file if it is present
-[ -r /etc/live.conf ] && . /etc/live.conf
+# Read snapshot configuration variables
+[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
 
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
@@ -48,7 +49,7 @@ cache_path()
        then
                if [ -x "${path}" ]
                then
-                       if file "${path}" | grep -q 'dynamically linked'
+                       if file -L "${path}" | grep -q 'dynamically linked'
                        then
                                for lib in $(ldd "${path}" | awk '{ print $3 }')
                                do
@@ -96,6 +97,7 @@ 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}"
@@ -134,7 +136,7 @@ do_stop ()
                prompt=
        fi
 
-       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
+       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
        do
                cache_path "${path}"
        done
@@ -185,13 +187,6 @@ 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
@@ -203,9 +198,10 @@ case "${1}" in
                ;;
        start)
                log_begin_msg "${NAME} is configuring sendsigs..."
-               if [ -f /live/image/root.pid ] ; then
-                       cat /live/image/root.pid >> /var/run/sendsigs.omit
+               if [ -f /live/root.pid ] ; then
+                       cat /live/root.pid >> /var/run/sendsigs.omit
                fi
+               log_end_msg 0
                ;;
 
        stop)