Sync with Debian's upstream/3.0_a27 (new log file name, persistency reworked,...)

[live-boot-grml.git] / bin / live-snapshot

diff --git a/bin/live-snapshot b/bin/live-snapshot
index eccabbc..6ba45f2 100755 (executable)
--- 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.
 #
@@ -23,7 +23,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# On Debian systems, the complete text of the GNU General Public License
+# The complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL-3 file.
 
 # declare here two vars from /etc/live.conf because of "set -u"
@@ -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
@@ -142,10 +142,10 @@ Version ()
        echo "along with this program; if not, write to the Free Software"
        echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
        echo
-       echo "On Debian systems, the complete text of the GNU General Public License"
+       echo "The complete text of the GNU General Public License"
        echo "can be found in /usr/share/common-licenses/GPL-3 file."
        echo
-       echo "Homepage: <http://debian-live.alioth.debian.org/>"
+       echo "Homepage: <http://live.debian.net/>"
 
        exit 0
 }
@@ -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
 }