live-snapshot: removed an unused and useless function.

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

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 0038c87..d4c6c34 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -2,11 +2,11 @@
 
 # live-snapshot - utility to manage Debian Live systems snapshots
 #
-#   This program mount a device (fallback to /tmpfs under $MOUNTP
-#   and save the /live/cow (or a different dir) filesystem in it for reusing
+#   This program mounts a device (fallback to /tmpfs under $MOUNTP
+#   and saves the /live/cow (or a different dir) filesystem in it for reuse
 #   in another live-initramfs session. Look at manpage for more info.
 #
-# Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
+# Copyright (C) 2006-2008 Marco Amadori <marco.amadori@gmail.com>
 # Copyright (C) 2008 Chris Lamb <chris@chris-lamb.co.uk>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -95,13 +95,13 @@ Usage ()
 
        exit 0
 }
-       
 
 Version ()
 {
        echo "${PROGRAM}"
        echo
        echo "Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>"
+       echo "Copyright (C) 2008 Chris Lamb <chris@chris-lamb.co.uk>"
        echo
        echo "This program is free software; you can redistribute it and/or modify"
        echo "it under the terms of the GNU General Public License as published by"
@@ -125,19 +125,6 @@ Version ()
        exit 0
 }
 
-Is_same_mount ()
-{
-       dir1="$(Base_path ${1})"
-       dir2="$(Base_path ${2})"
-
-       if [ "${dir1}" = "${dir2}" ]
-       then
-               return 0
-       else
-               return 1
-       fi
-}
-
 Parse_args ()
 {
        # Parse command line
@@ -197,7 +184,6 @@ Parse_args ()
 
                esac
        done
-
 }
 
 Defaults ()
@@ -207,7 +193,7 @@ Defaults ()
        then
                SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | cut -f1 -d ':')
                SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':')
-               DEST=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':')
+               DEST="${MOUNTP}/$(echo ${SNAP_RESYNC_STRING} | cut -f3 -d ':')"
 
                case "${DEST}" in
                        *.cpio.gz)
@@ -229,7 +215,6 @@ Defaults ()
                                Error "unrecognized resync string"
                                ;;
                esac
-
        else
                # Set target file based on image
                case "${SNAP_TYPE}" in
@@ -246,14 +231,14 @@ Defaults ()
                                ;;
                esac
        fi
-
 }
 
 Validate_input ()
 {
-       case "${SNAP_TYPE}" in 
+       case "${SNAP_TYPE}" in
                cpio|squashfs|jffs2|ext2|ext3)
                        ;;
+
                *)
                        Error "invalid filesystem type \"${SNAP_TYPE}\""
                        ;;
@@ -279,6 +264,7 @@ Mount_device ()
                        # create a temp
                        mount -t tmpfs -o rw tmpfs "${MOUNTP}"
                        ;;
+
                *)
                        if [ -b "${SNAP_DEV}" ]
                        then
@@ -333,7 +319,7 @@ Main ()
        Parse_args "${@}"
        Defaults
        Validate_input
-       trap 'Clean' EXIT 
+       trap 'Clean' EXIT
        Mount_device
        Do_snapshot
 }