X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot-grml.init;h=ab09d2a5b08d7599c62a117e17b9626224ccf041;hb=aa79a70ee51dce6c2dc06ac51d6e65a6c0b7a3e9;hp=f0982a8e9aad130120dc19258c5a030b19926128;hpb=ec72422e74e8e863cf8962ef1fe530180ed21afa;p=live-boot-grml.git

diff --git a/debian/live-boot-grml.init b/debian/live-boot-grml.init
index f0982a8..ab09d2a 100644
--- a/debian/live-boot-grml.init
+++ b/debian/live-boot-grml.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
@@ -187,7 +200,7 @@ do_stop ()
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 
-			if [ ${NOPROMPT} = "cd" ]
+			if [ "${NOPROMPT}" = "cd" ]
 			then
 				prompt=
 			fi
@@ -211,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..."