X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=9d6bc69ae9ec3451b8fca5cbf0555d1ff0aa5054;hb=c0462668aa294df13900feb54c51258560efd804;hp=03bc3902f8ee955d6a794391a54527f926be0543;hpb=7a06cd805a86a33b23fc13c8bc2628d8f31ebc59;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 03bc390..9d6bc69 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
@@ -95,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}"