From 5be53fa805fe515ea3eb45786fa76c5bb6a7ea2d Mon Sep 17 00:00:00 2001 From: Marco Amadori Date: Mon, 13 Sep 2010 17:12:31 +0200 Subject: [PATCH] Fixed some snapshot related debug messages. Signed-off-by: Marco Amadori --- debian/live-boot.init | 1 + scripts/live | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/live-boot.init b/debian/live-boot.init index 6c3e665..cefa59b 100644 --- a/debian/live-boot.init +++ b/debian/live-boot.init @@ -97,6 +97,7 @@ do_stop () { if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline then + # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file if [ ! -z "${ROOTSNAP}" ] then ${DO_SNAPSHOT} --resync-string="${ROOTSNAP}" diff --git a/scripts/live b/scripts/live index 98129a5..169ffb4 100755 --- a/scripts/live +++ b/scripts/live @@ -896,6 +896,8 @@ do_snap_copy () if [ -b "${fromdev}" ] then + log_success_msg "Copying snapshot ${fromdev} to ${todir}..." + # look for free mem if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ] then @@ -933,9 +935,8 @@ do_snap_copy () return 0 else - return 1 - log_warning_msg "Unable to find the snapshot ${snap_type} medium" + return 1 fi } @@ -1045,7 +1046,7 @@ try_snap () if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" then - log_warning_msg "Impossible to include the ${snap_type} Snapshot" + log_warning_msg "Impossible to include the ${snap_type} Snapshot (i)" return 1 else if [ -n "${snapfile}" ] -- 2.1.4