X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=5799c4497c054e9f28c3a7c265f5d5838fdd6cd3;hb=38fd15ac1afd07f6ccae465b4579a7dd4dccb9d4;hp=9d6bc69ae9ec3451b8fca5cbf0555d1ff0aa5054;hpb=2a7c08fbc58e599b8bcd884deda606d221637046;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 9d6bc69..5799c44 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -47,15 +47,28 @@ cache_path()
 		find "${path}" -type f | xargs cat > /dev/null 2>&1
 	elif [ -f "${path}" ]
 	then
-		if [ -x "${path}" ]
+		if file -L "${path}" | grep -q 'dynamically linked'
 		then
-			if file -L "${path}" | grep -q 'dynamically linked'
-			then
-				for lib in $(ldd "${path}" | awk '{ print $3 }')
-				do
-					cache_path "${lib}"
-				done
-			fi
+			# ldd output can be of three forms:
+			# 1. linux-vdso.so.1 =>  (0x00007fffe3fb4000)
+			#    This is a virtual, kernel shared library and we want to skip it
+			# 2. libc.so.6 => /lib/libc.so.6 (0x00007f5e9dc0c000)
+			#    We want to cache the third word.
+			# 3. /lib64/ld-linux-x86-64.so.2 (0x00007f5e9df8b000)
+			#    We want to cache the first word.
+			ldd "${path}" | while read line
+			do
+				if echo "$line" | grep -qs ' =>  '
+				then
+					continue
+				elif echo "$line" | grep -qs ' => '
+				then
+					lib=$(echo "${line}" | awk '{ print $3 }')
+				else
+					lib=$(echo "${line}" | awk '{ print $1 }')
+				fi
+				cache_path "${lib}"
+			done
 		fi
 
 		cat "${path}" >/dev/null 2>&1
@@ -114,6 +127,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
@@ -130,7 +149,7 @@ do_stop ()
 	fi
 
 	prompt=1
-	if grep -qs noprompt /proc/cmdline
+	if [ "${NOPROMPT}" = "Yes" ]
 	then
 		prompt=
 	fi
@@ -149,6 +168,8 @@ do_stop ()
 		esac
 	done
 
+	mount -o remount,ro /live/cow
+
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -164,15 +185,26 @@ 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)"
+			MESSAGE="Please remove the disc, close the tray (if any)"
 
 			if [ -x /usr/bin/eject ]
 			then
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 
+			if [ ${NOPROMPT} = "cd" ]
+			then
+				prompt=
+			fi
+
 		fi
 
 		[ "$prompt" ] || return 0
@@ -192,16 +224,9 @@ do_stop ()
 }
 
 case "${1}" in
-	restart|reload|force-reload|status)
+	start|restart|reload|force-reload|status)
 		[ "${VERBOSE}" != no ] && log_end_msg 0
 		;;
-	start)
-		log_begin_msg "${NAME} is configuring sendsigs..."
-		if [ -f /live/root.pid ] ; then
-			cat /live/root.pid >> /var/run/sendsigs.omit
-		fi
-		log_end_msg 0
-		;;
 
 	stop)
 		log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."
@@ -216,8 +241,6 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
-
-		mount -o remount,ro /live/cow
 		;;
 
 	*)