Adding upstream version 1.91.4.

[live-boot-grml.git] / bin / live-snapshot

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 0c24f00..a7214bd 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -3,7 +3,7 @@
 # live-snapshot - utility to manage Debian Live systems snapshots
 #
 #   This program mount a device (fallback to /tmpfs under /mnt/snapshot
-#   and save the /cow (or a different dir) filesystem in it for reusing
+#   and save the /live/cow (or a different dir) filesystem in it for reusing
 #   in another live-initramfs session. Look at manpage for more info.
 #
 # Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
@@ -23,7 +23,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 PROGRAM="`basename $0`"
 VERSION=0.0.1
@@ -90,7 +90,7 @@ Help ()
        Header
        echo
        echo "Options:"
-       echo "  -c, --cow: specifies the copy on write directory (default: /cow)."
+       echo "  -c, --cow: specifies the copy on write directory (default: /live/cow)."
        echo "  -d, --device: specifies the output snapshot device (default: none)."
        echo "  -o, --output: specifies the output image file (default: $type dependent)."
     echo "  -r, --resync-string: internally used to resync previous made snapshots."
@@ -120,7 +120,7 @@ Version ()
        echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
        echo
        echo "On Debian systems, the complete text of the GNU General Public License"
-       echo "can be found in /usr/share/common-licenses/GPL file."
+       echo "can be found in /usr/share/common-licenses/GPL-2 file."
        echo
        echo "Homepage: <http://debian-live.alioth.debian.org/>"
        exit 0
@@ -154,7 +154,7 @@ Is_same_mount ()
 {
        dir1="`Base_path $1`"
        dir2="`Base_path $2`"
-       if [ "${dir1}" == "${dir2}" ]; then
+       if [ "${dir1}" = "${dir2}" ]; then
                return 0
        else
                return 1
@@ -224,7 +224,7 @@ Mount_device ()
 Defaults ()
 {
        MOUNTP="/mnt/live-snapshot"
-       COW="/cow"
+       COW="/live/cow"
        DEV=""
        DEST="${MOUNTP}/live-sn.cpio.gz"
        TYPE="cpio"
@@ -248,7 +248,7 @@ Defaults ()
                                Usage "Unregognized String" ;;
                esac
        else
-               DEF_COW="/cow"
+               DEF_COW="/live/cow"
                # Bad options handling
                if [ -z "${SNAP_COW}" ]; then
                        COW="${DEF_COW}"