Adding upstream version 1.156.1.

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

diff --git a/bin/live-snapshot b/bin/live-snapshot
index b81a6af..d942c90 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -30,7 +30,12 @@
 ROOTSNAP=""
 HOMESNAP=""
 
-set -eu
+if [ -n "${LIVE_SNAPSHOT_CHECK_UNBOUND}" ]
+then
+       set -eu
+else
+       set -e
+fi
 
 . /usr/share/initramfs-tools/scripts/live-helpers
 
@@ -58,6 +63,7 @@ SNAP_OUTPUT=""
 SNAP_RESYNC_STRING=""
 SNAP_TYPE="cpio"
 SNAP_LIST="/etc/live-snapshot.list"
+EXCLUDE_LIST="/etc/live-snapshot.exclude_list"
 
 Error ()
 {
@@ -93,7 +99,7 @@ Help ()
        echo "  -o, --output: output image file (default: ${DEST})."
        echo "  -r, --resync-string: internally used to resync previous made snapshots."
        echo "  -f, --refresh: try to sync a running snapshot."
-       echo "  -t, --type: snapshot filesystem type. Options: \"squashfs\", \"ext2\", \"ext3\", \"jffs2\" or \"cpio\".gz archive (default: ${SNAP_TYPE})"
+       echo "  -t, --type: snapshot filesystem type. Options: \"squashfs\", \"ext2\", \"ext3\", \"ext4\", \"jffs2\" or \"cpio\".gz archive (default: ${SNAP_TYPE})"
        echo
        echo "Look at live-snapshot(1) man page for more information."
 
@@ -251,6 +257,11 @@ Defaults ()
                        ""|*.ext2|*.ext3)
                                SNAP_TYPE="ext2"
                                ;;
+
+                       *.ext4)
+                               SNAP_TYPE="ext4"
+                               ;;
+
                        *)
                                Error "unrecognized resync string"
                                ;;
@@ -270,6 +281,10 @@ Defaults ()
                        ext3)
                                DEST="${MOUNTP}/live-sn.ext2"
                                ;;
+
+                       ext4)
+                               DEST="${MOUNTP}/live-sn.ext4"
+                               ;;
                esac
        else
                DEST="${SNAP_OUTPUT}"
@@ -279,7 +294,7 @@ Defaults ()
 Validate_input ()
 {
        case "${SNAP_TYPE}" in
-               cpio|squashfs|jffs2|ext2|ext3)
+               cpio|squashfs|jffs2|ext2|ext3|ext4)
                        ;;
 
                *)
@@ -315,23 +330,49 @@ Mount_device ()
        esac
 }
 
+Entry_is_modified ()
+{
+       # Returns true if file exists and it is also present in "cow" directory
+       # This means it is modified in respect to read-only media, so it deserve
+       # to be saved
+
+       entry="${1}"
+
+       if [ -e "${entry}" ] || [ -L "${entry}" ]
+       then
+               if [ -e "${DEF_SNAP_COW}/${entry}" ] || [ -L "${DEF_SNAP_COW}/${entry}" ]
+               then
+                       return 0
+               fi
+       fi
+       return 1
+}
+
 Do_filelist ()
 {
-       # BUGS: supports only cpio.gz types right now
+       # BUGS: supports only cpio.gz types, and does not handle deleted files yet
+
        TMP_FILELIST=$1
        if [ -f "${SNAP_LIST}" ]
        then
-               # Generate include list
-               for entry in $(cat "${SNAP_LIST}" | grep -v '^#.*$' | grep -v '^ *$')
+               # Generate include list removing empty and commented lines
+               for entry in $(sed -e '/^ *$/d' -e '/^#.*$/d' "${SNAP_LIST}")
                do
-                       if [ -f "${entry}" ]
-                       then
-                               printf "%s\000" "${entry}" >> "${TMP_FILELIST}"
-                       elif [ -d "${entry}" ]
+                       if [ -d "${entry}" ]
                        then
                                cd /
-                               find "${entry}" -print0 >> "${TMP_FILELIST}"
+                               find "${entry}" | while read line
+                               do
+                                       if Entry_is_modified "${line}"
+                                       then
+                                               printf "%s\000" "${line}" >> "${TMP_FILELIST}"
+                                       fi
+                               done
                                cd "${OLDPWD}"
+                       elif Entry_is_modified "${entry}"
+                       then
+                               # if file exists and it is modified
+                               printf "%s\000" "${entry}" >> "${TMP_FILELIST}"
                        fi
                done
 
@@ -361,6 +402,13 @@ Do_snapshot ()
                        # Removing whiteheads of unionfs
                        cd "${SNAP_COW}"
                        find . -name '*.wh.*' >> "${TMP_FILELIST}"
+
+                       if [ -e "${EXCLUDE_LIST}" ]
+                       then
+                               # Add explicitly excluded files
+                               grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' >> "${TMP_FILELIST}"
+                       fi
+
                        cd "${OLDPWD}"
                        mksquashfs "${SNAP_COW}" "${DEST}" -ef "${TMP_FILELIST}"
                        ;;
@@ -368,11 +416,29 @@ Do_snapshot ()
                cpio)
                        WORKING_DIR=$(Do_filelist "${TMP_FILELIST}")
                        cd "${WORKING_DIR}"
-                       cat "${TMP_FILELIST}" | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" || exit 1
+                       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}" | \
+                                       tr '\n' '\0' | \
+                                       tr '\1' '\n' | \
+                                       cpio --quiet -o0 -H newc | \
+                                       gzip -9c > "${DEST}" || exit 1
+                       else
+                               cat "${TMP_FILELIST}" | \
+                                       cpio --quiet -o0 -H newc | \
+                                       gzip -9c > "${DEST}" || exit 1
+                       fi
                        cd "${OLDPWD}"
                        ;;
 
-               ext2|ext3)
+               # ext2|ext3|ext4 and jffs2 does not easily support an exclude list; files
+               # should be copied to another directory in order to filter content
+               ext2|ext3|ext4)
                        DU_DIM="$(du -ks ${SNAP_COW} | cut -f1)"
                        REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here...
                        genext2fs --size-in-blocks=${REAL_DIM} --reserved-percentage=0 --root="${SNAP_COW}" "${DEST}"
@@ -405,7 +471,7 @@ Warn_user ()
        if [ -z "${SNAP_RESYNC_STRING}" ]
        then
                case ${SNAP_TYPE} in
-                       cpio|ext2|ext3)
+                       cpio|ext2|ext3|ext4)
                                echo "Please move ${DEST} (if is not already in it)" > /dev/null 1>&2
                                echo "in a supported writable partition (e.g ext3, vfat)." > /dev/null 1>&2
                                ;;