X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=12d0f94ede2ad72b95678da9db5776a33b73c3ad;hb=7a443bd282bb8d02f0513faf93c27a768973e79b;hp=6d900591e5f416d02aabfed1a21615023d3b210f;hpb=a1325949ebbeec69c0119ee5e3dab3912cac5c06;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 6d90059..12d0f94 100644
--- 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
@@ -49,7 +48,7 @@ cache_path()
 	then
 		if [ -x "${path}" ]
 		then
-			if file -L "${path}" | grep -q 'dynamically linked'
+			if file "${path}" | grep -q 'dynamically linked'
 			then
 				for lib in $(ldd "${path}" | awk '{ print $3 }')
 				do
@@ -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}"
@@ -115,12 +113,6 @@ do_stop ()
 		return 0
 	fi
 
-	# check for toram
-	if grep -qs toram /proc/cmdline
-	then
-		return 0
-	fi
-
 	# Don't prompt to eject the SD card on Babbage board, where we reuse it
 	# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
 	# (archdetect), but since this is mostly only relevant for
@@ -142,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
@@ -156,8 +148,6 @@ do_stop ()
 		esac
 	done
 
-	mount -o remount,ro /live/cow
-
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -175,7 +165,7 @@ do_stop ()
 			MESSAGE="Please remove the USB flash drive"
 		else
 			# ejecting is a very good idea here
-			MESSAGE="Please remove the disc, close the tray (if any)"
+			MESSAGE="Please remove the disc, close the the tray (if any)"
 
 			if [ -x /usr/bin/eject ]
 			then
@@ -195,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
@@ -225,6 +222,8 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
+
+		mount -o remount,ro /live/cow
 		;;
 
 	*)