Adding upstream version 1.118.1.

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

diff --git a/bin/live-snapshot b/bin/live-snapshot
index e508c2a..ffa4670 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -35,10 +35,9 @@ then
 else
        USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
        HOSTNAME=$(hostname)
-       BUILD_SYSTEM="Debian"
 fi
 
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME
 
 # Source helper functions
 helpers="/usr/share/initramfs-tools/scripts/live-helpers"
@@ -84,7 +83,7 @@ Usage ()
 
        if [ ! -z "${MESSAGE}" ]
        then
-               echo -e "${MESSAGE}"
+               /bin/echo -e "${MESSAGE}"
                exit 1
        else
                exit 0
@@ -100,9 +99,9 @@ Help ()
        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."
-       echo "  -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\", \"ext3\" or \"cpio\".gz archive (default: cpio)"
-    echo -e "\nLook at live-snapshot(1) man page for more information."
+       echo "  -r, --resync-string: internally used to resync previous made snapshots."
+       echo "  -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\", \"ext3\", \"jffs2\" or \"cpio\".gz archive (default: cpio)"
+       /bin/echo -e "\nLook at live-snapshot(1) man page for more information."
 
        exit 0
 }
@@ -155,6 +154,10 @@ Do_snapshot ()
                        genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${COW}" "${DEST}" || exit 1
                        ;;
 
+               jffs2)
+                       mkfs.jffs2 --root="${COW}" --output="${DEST}" || exit 1
+                       ;;
+
                *)
                        echo "Internal error."
                        exit 1
@@ -291,6 +294,10 @@ Defaults ()
                                TYPE="squashfs"
                                ;;
 
+                       *.jffs2)
+                               TYPE="jffs2"
+                               ;;
+
                        ""|*.ext2|*.ext3)
                                TYPE="ext2"
                                ;;
@@ -311,7 +318,7 @@ Defaults ()
                fi
 
                case "${SNAP_TYPE}" in
-                       "cpio"|"squashfs"|"ext2"|"ext3")
+                       "cpio"|"squashfs"|"ext2"|"ext3"|"jffs2")
                                TYPE="${SNAP_TYPE}"
                                ;;