X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=blobdiff_plain;f=bin%2Flive-snapshot;h=b81a6af89e73b92140ecb0d2f604351e41910d49;hp=70073fc6f54dd516b780e9863265bfb6e5b9adce;hb=02f0fb6ca32464adc6d6dd80878ac62bd75048ec;hpb=aab75484c29a3c2ce95d2e23148970debfbd2a69 diff --git a/bin/live-snapshot b/bin/live-snapshot index 70073fc..b81a6af 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -3,15 +3,16 @@ # 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 dir) filesystem in it for reuse -# in another live-initramfs session. Look at manpage for more info. +# and saves the /live/cow (or a different directory) filesystem in it +# for reuse in another live-initramfs session. +# Look at the manpage for more informations. # -# Copyright (C) 2006 Marco Amadori +# Copyright (C) 2006-2008 Marco Amadori # Copyright (C) 2008 Chris Lamb # -# This program is free software; you can redistribute it and/or modify +# This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -20,32 +21,43 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# along with this program. If not, see . # # On Debian systems, the complete text of the GNU General Public License -# can be found in /usr/share/common-licenses/GPL-2 file. +# can be found in /usr/share/common-licenses/GPL-3 file. + +# declare here two vars from /etc/live.conf because of "set -u" +ROOTSNAP="" +HOMESNAP="" set -eu . /usr/share/initramfs-tools/scripts/live-helpers -. /etc/live.conf + +LIVE_CONF="/etc/live.conf" +. "${LIVE_CONF}" export USERNAME USERFULLNAME HOSTNAME -PROGRAM="$(basename $0)" +EXECUTABLE="${0}" +PROGRAM=$(basename "${EXECUTABLE}") # Needs to be available at run and reboot time SAFE_TMPDIR="/live" # Permits multiple runs MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)" -SNAP_COW="/live/cow" -SNAP_DEV="" DEST="${MOUNTP}/live-sn.cpio.gz" -SNAP_TYPE="cpio" -DESKTOP_LINK="/home/${USERNAME}/Desktop/live-snapshot" +DEF_SNAP_COW="/live/cow" +TMP_FILELIST="${PROGRAM}.list" + +# Command line defaults and declarations +SNAP_COW="${DEF_SNAP_COW}" +SNAP_DEV="" +SNAP_OUTPUT="" SNAP_RESYNC_STRING="" +SNAP_TYPE="cpio" +SNAP_LIST="/etc/live-snapshot.list" Error () { @@ -64,6 +76,7 @@ Header () echo echo "usage: ${PROGRAM} [-c|--cow DIRECTORY] [-d|--device DEVICE] [-o|--output FILE] [-t|--type TYPE]" echo " ${PROGRAM} [-r|--resync-string STRING]" + echo " ${PROGRAM} [-f|--refresh]" echo " ${PROGRAM} [-h|--help]" echo " ${PROGRAM} [-u|--usage]" echo " ${PROGRAM} [-v|--version]" @@ -79,6 +92,7 @@ Help () echo " -d, --device: output snapshot device (default: ${SNAP_DEV:-auto})." 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 echo "Look at live-snapshot(1) man page for more information." @@ -95,13 +109,13 @@ Usage () exit 0 } - Version () { echo "${PROGRAM}" echo echo "Copyright (C) 2006 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" @@ -125,16 +139,24 @@ Version () exit 0 } -Is_same_mount () +Try_refresh () { - dir1="$(Base_path ${1})" - dir2="$(Base_path ${2})" + FOUND="" + if [ -n "${ROOTSNAP}" ]; then + "${EXECUTABLE}" --resync-string="${ROOTSNAP}" + FOUND="Yes" + fi + + if [ -n "${HOMESNAP}" ]; then + "${EXECUTABLE}" --resync-string="${HOMESNAP}" + FOUND="Yes" + fi - if [ "${dir1}" = "${dir2}" ] + if [ -z "${FOUND}" ] then - return 0 - else - return 1 + echo "No autoconfigured snapshots found at boot;" > /dev/null 1>&2 + echo "(no resync string in ${LIVE_CONF})." > /dev/null 1>&2 + exit 1 fi } @@ -142,7 +164,7 @@ Parse_args () { # Parse command line ARGS="${*}" - ARGUMENTS="$(getopt --longoptions cow:,device:,output,resync-string:,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:,h,u,v --shell sh -- ${ARGS})" + ARGUMENTS="$(getopt --longoptions cow:,device:,output,resync-string:,refresh,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:fhuv --shell sh -- ${ARGS})" eval set -- "${ARGUMENTS}" @@ -174,6 +196,11 @@ Parse_args () break ;; + -f|--refresh) + Try_refresh + exit 0 + ;; + -h|--help) Help ;; @@ -197,7 +224,6 @@ Parse_args () esac done - } Defaults () @@ -207,7 +233,7 @@ Defaults () then SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | cut -f1 -d ':') SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':') - DEST=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':') + DEST="${MOUNTP}/$(echo ${SNAP_RESYNC_STRING} | cut -f3 -d ':')" case "${DEST}" in *.cpio.gz) @@ -229,8 +255,8 @@ Defaults () Error "unrecognized resync string" ;; esac - - else + elif [ -z "${SNAP_OUTPUT}" ] + then # Set target file based on image case "${SNAP_TYPE}" in cpio) @@ -245,15 +271,17 @@ Defaults () DEST="${MOUNTP}/live-sn.ext2" ;; esac + else + DEST="${SNAP_OUTPUT}" fi - } Validate_input () { - case "${SNAP_TYPE}" in + case "${SNAP_TYPE}" in cpio|squashfs|jffs2|ext2|ext3) ;; + *) Error "invalid filesystem type \"${SNAP_TYPE}\"" ;; @@ -272,13 +300,12 @@ Validate_input () Mount_device () { - mkdir -p "${MOUNTP}" - case "${SNAP_DEV}" in "") # create a temp mount -t tmpfs -o rw tmpfs "${MOUNTP}" ;; + *) if [ -b "${SNAP_DEV}" ] then @@ -288,21 +315,61 @@ Mount_device () esac } +Do_filelist () +{ + # BUGS: supports only cpio.gz types right now + TMP_FILELIST=$1 + if [ -f "${SNAP_LIST}" ] + then + # Generate include list + for entry in $(cat "${SNAP_LIST}" | grep -v '^#.*$' | grep -v '^ *$') + do + if [ -f "${entry}" ] + then + printf "%s\000" "${entry}" >> "${TMP_FILELIST}" + elif [ -d "${entry}" ] + then + cd / + find "${entry}" -print0 >> "${TMP_FILELIST}" + cd "${OLDPWD}" + fi + done + + if [ "${SNAP_COW}" = "${DEF_SNAP_COW}" ] + then + # Relative to rootfs + echo "/" + else + # Mostly "/home" + echo "${SNAP_COW}" + fi + else + cd "${SNAP_COW}" + find . -path '*.wh.*' -prune -o -print0 >> "${TMP_FILELIST}" + cd "${OLDPWD}" + echo "${SNAP_COW}" + fi +} + Do_snapshot () { + TMP_FILELIST=$(mktemp -p "${SAFE_TMPDIR}" "${TMP_FILELIST}.XXXXXX") + case "${SNAP_TYPE}" in squashfs) - EXCLUDE_LIST="$(mktemp -p ${SAFE_TMPDIR} live-snapshot-exclude-list.XXXXXX)" - echo "./${EXCLUDE_LIST}" > "${EXCLUDE_LIST}" + echo ".${TMP_FILELIST}" > "${TMP_FILELIST}" + # Removing whiteheads of unionfs cd "${SNAP_COW}" - find . -name '*.wh.*' >> "${EXCLUDE_LIST}" + find . -name '*.wh.*' >> "${TMP_FILELIST}" cd "${OLDPWD}" - mksquashfs "${SNAP_COW}" "${DEST}" -ef "${EXCLUDE_LIST}" - rm -f "${EXCLUDE_LIST}" + mksquashfs "${SNAP_COW}" "${DEST}" -ef "${TMP_FILELIST}" ;; cpio) - ( cd "${SNAP_COW}" && find . -path '*.wh.*' -prune -o -print0 | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" ) || exit 1 + WORKING_DIR=$(Do_filelist "${TMP_FILELIST}") + cd "${WORKING_DIR}" + cat "${TMP_FILELIST}" | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" || exit 1 + cd "${OLDPWD}" ;; ext2|ext3) @@ -315,11 +382,16 @@ Do_snapshot () mkfs.jffs2 --root="${SNAP_COW}" --output="${DEST}" ;; esac + + if [ -f "${TMP_FILELIST}" ] + then + rm -f "${TMP_FILELIST}" + fi } Clean () { - if echo "${DEST}" | grep -q "${MOUNTP}" + if [ -z "${SNAP_RESYNC_STRING}" ] && echo "${DEST}" | grep -q "${MOUNTP}" then echo "${DEST} is present on ${MOUNTP}, therefore no automatic unmounting the latter." > /dev/null 1>&2 else @@ -328,14 +400,42 @@ Clean () fi } +Warn_user () +{ + if [ -z "${SNAP_RESYNC_STRING}" ] + then + case ${SNAP_TYPE} in + cpio|ext2|ext3) + 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 + ;; + + squashfs) + echo "To use ${DEST} you need to rebuild your media or add it" > /dev/null 1>&2 + echo "to your multisession disc under the \"/live\" directory." > /dev/null 1>&2 + ;; + + jffs2) + echo "Please cat or flashcp ${DEST} to your partition in order to start using it." > /dev/null 1>&2 + ;; + esac + + if grep -qv persistent /proc/cmdline + then + echo "Remember to boot this live system with \"persistent\" specified at boot prompt." > /dev/null 1>&2 + fi + fi +} + Main () { Parse_args "${@}" Defaults Validate_input - trap 'Clean' EXIT + trap 'Clean' EXIT Mount_device Do_snapshot + Warn_user } Main "${@:-}"