X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=bin%2Flive-snapshot;h=6ba45f24c371b63543522e7b5d0b75a6f0271e1f;hb=a98122bd7721d262f12e6dfeaedad5337fd6b606;hp=82addabf8d9baeed091b6fb74782a3200527a3bd;hpb=bdeec25e35c3df1ae9fb8d147dd908d6d6afa010;p=live-boot-grml.git

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 82addab..6ba45f2 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -3,7 +3,7 @@
 # live-snapshot - utility to manage Debian Live systems snapshots
 #
 #   This program mounts a device (fallback to /tmpfs under $MOUNTP
-#   and saves the /live/cow (or a different directory) filesystem in it
+#   and saves the /live/overlway (or a different directory) filesystem in it
 #   for reuse in another live-boot session.
 #   Look at the manpage for more informations.
 #
@@ -57,7 +57,7 @@ SAFE_TMPDIR="/live"
 # Permits multiple runs
 MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)"
 DEST="${MOUNTP}/live-sn.cpio.gz"
-DEF_SNAP_COW="/live/cow"
+DEF_SNAP_COW="/live/overlay"
 TMP_FILELIST="${PROGRAM}.list"
 
 # Command line defaults and declarations
@@ -365,7 +365,7 @@ Do_filelist ()
 
 	if [ -f "${SNAP_LIST}" ]
 	then
-		# if SNAP_COW == /live/cow/home, SNAP_RW = /home
+		# if SNAP_COW == /live/overlay/home, SNAP_RW = /home
 		SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g")
 		if [ -z "${SNAP_RW}" ]
 		then
@@ -409,6 +409,13 @@ Do_filelist ()
 Do_snapshot ()
 {
 	TMP_FILELIST=$(mktemp -p "${SAFE_TMPDIR}" "${TMP_FILELIST}.XXXXXX")
+	if [ -e "${EXCLUDE_LIST}" ]
+	then
+		# Create a TMP filelist removing empty lines (grep -f does not like them)
+		# and comments (for speedup and LST)
+		TMP_EXCLUDE_LIST=$(mktemp -p "${SAFE_TMPDIR}" "${PROGRAM}_excludelist.XXXXXX")
+		grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' > "${TMP_EXCLUDE_LIST}"
+	fi
 
 	case "${SNAP_TYPE}" in
 		squashfs)
@@ -420,7 +427,7 @@ Do_snapshot ()
 			if [ -e "${EXCLUDE_LIST}" ]
 			then
 				# Add explicitly excluded files
-				grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' >> "${TMP_FILELIST}"
+				cat "${TMP_EXCLUDE_LIST}" >> "${TMP_FILELIST}"
 			fi
 
 			cd "${OLDPWD}"
@@ -439,12 +446,13 @@ Do_snapshot ()
 			cd "${WORKING_DIR}"
 			if [ -e "${EXCLUDE_LIST}" ]
 			then
+
 				# Convert \0 to \n and tag existing (rare but possible) \n in filenames,
 				# this to let grep -F -v do a proper work in filtering out
 				cat "${TMP_FILELIST}" | \
 					tr '\n' '\1' | \
 					tr '\0' '\n' | \
-					grep -F -v -f "${EXCLUDE_LIST}" | \
+					grep -F -v -f "${TMP_EXCLUDE_LIST}" | \
 					tr '\n' '\0' | \
 					tr '\1' '\n' | \
 					eval $COPY_CMD || exit 1
@@ -468,10 +476,14 @@ Do_snapshot ()
 			;;
 	esac
 
-	if [ -f "${TMP_FILELIST}" ]
-	then
-		rm -f "${TMP_FILELIST}"
-	fi
+	# Remove temporary file lists
+	for filelist in "${TMP_FILELIST}" "${TMP_EXCLUDE_LIST}"
+	do
+		if [ -f "${filelist}" ]
+		then
+			rm -f "${filelist}"
+		fi
+	done
 }
 
 Clean ()
@@ -505,9 +517,9 @@ Warn_user ()
 				;;
 		esac
 
-		if grep -qv persistent /proc/cmdline
+		if grep -qv persistence /proc/cmdline
 		then
-			echo "Remember to boot this live system with \"persistent\" specified at boot prompt." > /dev/null 1>&2
+			echo "Remember to boot this live system with \"persistence\" specified at boot prompt." > /dev/null 1>&2
 		fi
 	fi
 }