X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=2ea72cbaa254742258a17a12dc1d39121688f5d8;hb=48dd8b9f46a90514cf8960b66a1a69bad7ecd2c1;hp=71ae1226b85c11f20cfffb09cb333224650c34f3;hpb=d2cb191d36246a778491af974365afbe5450a52f;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 71ae122..2ea72cb 100644
--- 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}"
@@ -113,6 +115,12 @@ 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
@@ -134,7 +142,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 +193,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,8 +204,8 @@ 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
 		;;