X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=8ccbc01cc9842f5cd2cff0691721300819096561;hb=24e652917a129fac93d3bc5a34b265cf8a913cfc;hp=b93cfcdd0647d33498a902df65f41d1b4162880c;hpb=089ae56f49ab73a926c28d96baee58986ade09a8;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index b93cfcd..8ccbc01 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -49,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 +96,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 +114,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
@@ -129,7 +136,7 @@ do_stop ()
 	fi
 
 	prompt=1
-	if grep -qs noprompt /proc/cmdline
+	if [ ${NOPROMPT} = "Yes" ]
 	then
 		prompt=
 	fi
@@ -148,6 +155,8 @@ do_stop ()
 		esac
 	done
 
+	mount -o remount,ro /live/cow
+
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -163,6 +172,12 @@ do_stop ()
 			# failes because they actually remember the
 			# "ejected" state even after reboot
 			MESSAGE="Please remove the USB flash drive"
+
+			if [ ${NOPROMPT} = "usb" ]
+			then
+				prompt=
+			fi
+
 		else
 			# ejecting is a very good idea here
 			MESSAGE="Please remove the disc, close the the tray (if any)"
@@ -172,6 +187,11 @@ do_stop ()
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 
+			if [ ${NOPROMPT} = "cd" ]
+			then
+				prompt=
+			fi
+
 		fi
 
 		[ "$prompt" ] || return 0
@@ -215,8 +235,6 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
-
-		mount -o remount,ro /live/cow
 		;;
 
 	*)