From 6f3407bdee281e933c2a80fe5c3a5a5d30194687 Mon Sep 17 00:00:00 2001 From: Marco Amadori Date: Mon, 13 Sep 2010 17:15:29 +0200 Subject: [PATCH] Added support for empty (initial) snapshots. Signed-off-by: Marco Amadori --- scripts/live | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/live b/scripts/live index 07deb55..18881af 100755 --- a/scripts/live +++ b/scripts/live @@ -1074,8 +1074,16 @@ try_snap () cpioargs='--unconditional --make-directories' fi - cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null - RES="$?" + if [ -s "${snapback}/${snapfile}" ] + then + BEFOREDIR="$(pwd)" + cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null + RES="$?" + cd "${BEFOREDIR}" + else + log_warning_msg "${snapback}/${snapfile} is empty, adding it for sync on reboot." + RES="0" + fi if [ "${RES}" != "0" ] then -- 2.1.4