X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=bin%2Flive-snapshot;h=08e5fd654adf08609dc9d7a411da83fc58b3f3a1;hb=52dcef518bdb95605670b8dc12257057bf7a2dc0;hp=85a0ab5a69f4446a823f8520a2ef6c2db80db0fa;hpb=15014add2a366cca6bb0aea0b1d02b010e215dc9;p=live-boot-grml.git diff --git a/bin/live-snapshot b/bin/live-snapshot index 85a0ab5..08e5fd6 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -4,7 +4,7 @@ # # 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. +# for reuse in another live-boot session. # Look at the manpage for more informations. # # Copyright (C) 2006-2008 Marco Amadori @@ -40,7 +40,11 @@ fi . /usr/share/initramfs-tools/scripts/live-helpers LIVE_CONF="/etc/live.conf" -. "${LIVE_CONF}" + +if [ -r "${LIVE_CONF}" ] +then + . "${LIVE_CONF}" +fi export USERNAME USERFULLNAME HOSTNAME @@ -59,6 +63,7 @@ TMP_FILELIST="${PROGRAM}.list" # Command line defaults and declarations SNAP_COW="${DEF_SNAP_COW}" SNAP_DEV="" +SNAP_MNT="" SNAP_OUTPUT="" SNAP_RESYNC_STRING="" SNAP_TYPE="cpio" @@ -99,7 +104,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." @@ -237,11 +242,12 @@ Defaults () # Parse resync string if [ -n "${SNAP_RESYNC_STRING}" ] then - SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | cut -f1 -d ':') + SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -e 's|^/root\([^:.]*\).*$|'"${DEF_SNAP_COW}"'\1|') SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':') - DEST="${MOUNTP}/$(echo ${SNAP_RESYNC_STRING} | cut -f3 -d ':')" + SNAP_MNT=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':') + DEST="${MOUNTP}/${SNAP_MNT}" - case "${DEST}" in + case "${SNAP_MNT}" in *.cpio.gz) SNAP_TYPE="cpio" ;; @@ -254,9 +260,18 @@ Defaults () SNAP_TYPE="jffs2" ;; - ""|*.ext2|*.ext3) + *.ext2|*.ext3) SNAP_TYPE="ext2" ;; + + "") + SNAP_TYPE="whole_partition" + ;; + + *.ext4) + SNAP_TYPE="ext4" + ;; + *) Error "unrecognized resync string" ;; @@ -276,6 +291,10 @@ Defaults () ext3) DEST="${MOUNTP}/live-sn.ext2" ;; + + ext4) + DEST="${MOUNTP}/live-sn.ext4" + ;; esac else DEST="${SNAP_OUTPUT}" @@ -285,7 +304,7 @@ Defaults () Validate_input () { case "${SNAP_TYPE}" in - cpio|squashfs|jffs2|ext2|ext3) + cpio|squashfs|jffs2|ext2|ext3|ext4|whole_partition) ;; *) @@ -331,7 +350,7 @@ Entry_is_modified () if [ -e "${entry}" ] || [ -L "${entry}" ] then - if [ -e "${DEF_SNAP_COW}/${entry}" ] || [ -L "${DEF_SNAP_COW}/${entry}" ] + if [ -e "${SNAP_COW}/${entry}" ] || [ -L "${SNAP_COW}/${entry}" ] then return 0 fi @@ -341,17 +360,25 @@ Entry_is_modified () Do_filelist () { - # BUGS: supports only cpio.gz types, and does not handle deleted files yet - + # BUGS: 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 '^ *$') + # if SNAP_COW == /live/cow/home, SNAP_RW = /home + SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g") + if [ -z "${SNAP_RW}" ] + then + SNAP_RW="/" + fi + + cd "${SNAP_RW}" + # Generate include list removing empty and commented lines + # and transforming paths to relatives + for entry in $(sed -e '/^ *$/d' -e '/^#.*$/d' -e 's#^.*$#./&#' -e 's#/\+#/#g' "${SNAP_LIST}") do if [ -d "${entry}" ] then - cd / find "${entry}" | while read line do if Entry_is_modified "${line}" @@ -359,26 +386,22 @@ Do_filelist () 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 + cd "${OLDPWD}" - if [ "${SNAP_COW}" = "${DEF_SNAP_COW}" ] - then - # Relative to rootfs - echo "/" - else - # Mostly "/home" - echo "${SNAP_COW}" - fi + # echo Working dir + echo "${SNAP_RW}" else cd "${SNAP_COW}" + # removing whiteouts from list find . -path '*.wh.*' -prune -o -print0 >> "${TMP_FILELIST}" cd "${OLDPWD}" + # echo Working dir echo "${SNAP_COW}" fi } @@ -397,14 +420,21 @@ Do_snapshot () if [ -e "${EXCLUDE_LIST}" ] then # Add explicitly excluded files - cat "${EXCLUDE_LIST}" | grep -v '^#.*$' | grep -v '^ *$' >> "${TMP_FILELIST}" + grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' >> "${TMP_FILELIST}" fi cd "${OLDPWD}" mksquashfs "${SNAP_COW}" "${DEST}" -ef "${TMP_FILELIST}" ;; - cpio) + cpio|whole_partition) + if [ "${SNAP_TYPE}" = "cpio" ] + then + COPY_CMD="cpio --quiet -o0 -H newc | gzip -9c > ${DEST}" + else + COPY_CMD="cpio --quiet -pumd0 ${DEST}/" + fi + WORKING_DIR=$(Do_filelist "${TMP_FILELIST}") cd "${WORKING_DIR}" if [ -e "${EXCLUDE_LIST}" ] @@ -417,19 +447,17 @@ Do_snapshot () grep -F -v -f "${EXCLUDE_LIST}" | \ tr '\n' '\0' | \ tr '\1' '\n' | \ - cpio --quiet -o0 -H newc | \ - gzip -9c > "${DEST}" || exit 1 + eval $COPY_CMD || exit 1 else cat "${TMP_FILELIST}" | \ - cpio --quiet -o0 -H newc | \ - gzip -9c > "${DEST}" || exit 1 + eval $COPY_CMD || exit 1 fi cd "${OLDPWD}" ;; - # ext2|ext3 and jffs2 does not easily support an exclude list; files + # 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) + 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}" @@ -462,7 +490,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 ;;