Fixed some snapshot related debug messages.
authorMarco Amadori <amadorim@vdavda.com>
Mon, 13 Sep 2010 15:12:31 +0000 (17:12 +0200)
committerMarco Amadori <amadorim@vdavda.com>
Mon, 13 Sep 2010 15:18:56 +0000 (17:18 +0200)
Signed-off-by: Marco Amadori <amadorim@vdavda.com>
debian/live-boot.init
scripts/live

index 6c3e665..cefa59b 100644 (file)
@@ -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}"
index 98129a5..169ffb4 100755 (executable)
@@ -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}" ]