[SCM] live-boot branch, debian-next, updated. debian/3.0_a5-1-3-g82839c0

[Marco Amadori]

The following commit has been merged in the debian-next branch:
commit 33c98238b02eec474abadd87429fcc9f225c6743
Author: Marco Amadori <amadorim at vdavda.com>
Date:   Mon Sep 13 17:12:31 2010 +0200

    Fixed some snapshot related debug messages.
    
    Signed-off-by: Marco Amadori <amadorim at vdavda.com>

diff --git a/debian/live-boot.init b/debian/live-boot.init
index b93cfcd..c947e12 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -96,6 +96,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 bef055a..07deb55 100755
--- a/scripts/live
+++ b/scripts/live
@@ -957,6 +957,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
@@ -994,9 +996,8 @@ do_snap_copy ()
 
 		return 0
 	else
-		return 1
-
 		log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+		return 1
 	fi
 }
 
@@ -1106,7 +1107,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}" ]

-- 
live-boot