[SCM] debian-live branch, master, updated. 1.130.1-3-28-gd167d6e

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 4a97bac77f4e877581edabc08e4a87b4bfb1e8d0
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Sun Jun 8 00:50:42 2008 +0200

    live-snapshot: honour "-o|--output FILE".
    
    Signed-off-by: Marco Amadori <marco.amadori at gmail.com>

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 7cf9bf9..03245ea 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -42,6 +42,7 @@ SAFE_TMPDIR="/live"
 MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)"
 SNAP_COW="/live/cow"
 SNAP_DEV=""
+SNAP_OUTPUT=""
 DEST="${MOUNTP}/live-sn.cpio.gz"
 SNAP_TYPE="cpio"
 DESKTOP_LINK="/home/${USERNAME}/Desktop/live-snapshot"
@@ -215,7 +216,8 @@ Defaults ()
 				Error "unrecognized resync string"
 				;;
 		esac
-	else
+	elif [ -z "${SNAP_OUTPUT}" ]
+	then
 		# Set target file based on image
 		case "${SNAP_TYPE}" in
 			cpio)
@@ -230,6 +232,8 @@ Defaults ()
 				DEST="${MOUNTP}/live-sn.ext2"
 				;;
 		esac
+	else
+		DEST="${SNAP_OUTPUT}"
 	fi
 }
 

-- 
debian-live