X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=bin%2Flive-snapshot;h=6ba45f24c371b63543522e7b5d0b75a6f0271e1f;hb=3039c635545638a79f4f5e7705affb7997e5f918;hp=55673bbb5ef2f5ab3a7512064e0f6d7b8e4d2940;hpb=fc6b00203e75e21b101b8298681d3f6f7cfe3759;p=live-boot-grml.git diff --git a/bin/live-snapshot b/bin/live-snapshot index 55673bb..6ba45f2 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -3,11 +3,11 @@ # 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 -# for reuse in another live-initramfs session. +# 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. # -# Copyright (C) 2006-2008 Marco Amadori +# Copyright (C) 2006-2011 Marco Amadori # Copyright (C) 2008 Chris Lamb # # This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# 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" @@ -39,8 +39,12 @@ fi . /usr/share/initramfs-tools/scripts/live-helpers -LIVE_CONF="/etc/live.conf" -. "${LIVE_CONF}" +LIVE_CONF="/etc/live/boot.d/snapshot.conf" + +if [ -r "${LIVE_CONF}" ] +then + . "${LIVE_CONF}" +fi export USERNAME USERFULLNAME HOSTNAME @@ -53,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 @@ -121,12 +125,12 @@ Version () { echo "${PROGRAM}" echo - echo "Copyright (C) 2006 Marco Amadori " + echo "Copyright (C) 2006-2011 Marco Amadori " echo "Copyright (C) 2008 Chris Lamb " echo echo "This program is free software; you can redistribute it and/or modify" echo "it under the terms of the GNU General Public License as published by" - echo "the Free Software Foundation; either version 2 of the License, or" + echo "the Free Software Foundation; either version 3 of the License, or" echo "(at your option) any later version." echo echo "This program is distributed in the hope that it will be useful," @@ -138,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 "can be found in /usr/share/common-licenses/GPL-2 file." + 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: " + echo "Homepage: " exit 0 } @@ -238,7 +242,7 @@ Defaults () # Parse resync string if [ -n "${SNAP_RESYNC_STRING}" ] then - SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -e 's|^/root\([^:.]*\).*$|'"${DEF_SNAP_COW}"'\1|') + SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -r -e 's#^([^:]*).*$#'"${DEF_SNAP_COW}"'\1#') SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':') SNAP_MNT=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':') DEST="${MOUNTP}/${SNAP_MNT}" @@ -361,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 @@ -405,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) @@ -416,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}" @@ -435,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 @@ -464,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 () @@ -501,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 }