Adding upstream version 1.118.1.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 1dcbc74..332de10 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -436,7 +436,7 @@ is_live_path ()
 
        if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
        then
-               for FILESYSTEM in squashfs ext2 ext3 xfs dir
+               for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2
                do
                        if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
                        then
@@ -476,7 +476,7 @@ matches_uuid ()
 get_backing_device ()
 {
        case "${1}" in
-               *.squashfs|*.ext2|*.ext3)
+               *.squashfs|*.ext2|*.ext3|*.jffs2)
                        echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
                        ;;
 
@@ -507,13 +507,17 @@ mount_images_in_directory ()
 {
        directory="${1}"
        rootmnt="${2}"
+       mac="${3}"
+
 
        if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
+               match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
        then
-               setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}"
+               [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
+               setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
        else
                :
        fi
@@ -537,7 +541,7 @@ is_supported_fs ()
        fstype="${1}"
 
        case ${fstype} in
-               vfat|iso9660|udf|ext2|ext3|ntfs)
+               vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
                        return 0
                        ;;
        esac
@@ -801,7 +805,7 @@ try_snap ()
        snap_label="${1}"
        snap_mount="${2}"
        snap_type="${3}"
-       snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3")
+       snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
 
        if [ ! -z "${snapdata}" ]
        then
@@ -809,9 +813,9 @@ try_snap ()
                snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
                snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
 
-               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\)'
+               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
                then
-                       # squashfs or ext2/ext3 snapshot
+                       # squashfs, jffs2 or ext2/ext3 snapshot
                        dev=$(get_backing_device "${snapback}/${snapfile}")
 
                        if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
@@ -869,7 +873,7 @@ setup_unionfs ()
 {
        image_directory="${1}"
        rootmnt="${2}"
-
+        addimage_directory="${3}"
        modprobe -q -b ${UNIONTYPE}
 
        # run-init can't deal with images in a subdir, but we're going to
@@ -888,6 +892,9 @@ setup_unionfs ()
        then
                # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
                roopt="nfsro"
+       elif [ "${UNIONTYPE}" = "aufs" ]
+       then
+               roopt="rr"
        else
                roopt="ro"
        fi
@@ -907,7 +914,7 @@ setup_unionfs ()
                done
        else
                # ${MODULE}.module does not exist, create a list of images
-               for FILESYSTEM in squashfs ext2 ext3 xfs dir
+               for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
                do
                        for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
                        do
@@ -918,6 +925,20 @@ setup_unionfs ()
                        done
                done
 
+               if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+               then
+                       for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
+                       do
+                               for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+                               do
+                                       if [ -e "${IMAGE}" ]
+                                       then
+                                               image_string="${image_string} ${IMAGE}"
+                                       fi
+                               done
+                       done
+               fi
+
                # Now sort the list
                image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
        fi
@@ -966,6 +987,8 @@ setup_unionfs ()
                        cow_fstype=$(get_fstype "${cowprobe}")
                else
                        [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+                       cowdevice="tmpfs"
+                       cow_fstype="tmpfs"
                fi
        elif [ -n "${NFS_COW}" ]
        then
@@ -978,7 +1001,7 @@ setup_unionfs ()
                        nfs_cow_opts="-o nolock"
                        nfs_cow=${NFS_COW}
                fi
-               mac=$(get_mac)
+               mac="$(get_mac)"
                if [ -n "${mac}" ]
                then
                        cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/")
@@ -1165,7 +1188,8 @@ find_livefs ()
                        done
                elif [ "${fstype}" = "squashfs" -o \
                        "${fstype}" = "ext2" -o \
-                       "${fstype}" = "ext3" ]
+                       "${fstype}" = "ext3" -o \
+                       "${fstype}" = "jffs2" ]
                then
                        # This is an ugly hack situation, the block device has
                        # an image directly on it.  It's hopefully
@@ -1179,14 +1203,6 @@ find_livefs ()
        return 1
 }
 
-pulsate ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "PULSATE"
-       fi
-}
-
 set_usplash_timeout ()
 {
        if [ -x /sbin/usplash_write ]
@@ -1206,7 +1222,6 @@ mountroot ()
 
        set_usplash_timeout
        [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
-       pulsate
        run_scripts /scripts/live-premount
        [ "${quiet}" != "y" ] && log_end_msg
 
@@ -1262,7 +1277,9 @@ mountroot ()
        then
                setup_unionfs "${livefs_root}" "${rootmnt}"
        else
-               mount_images_in_directory "${livefs_root}" "${rootmnt}"
+               mac="$(get_mac)"
+               mac="$(echo ${mac} | sed 's/-//g')"
+               mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
 
        log_end_msg
@@ -1270,7 +1287,6 @@ mountroot ()
        maybe_break live-bottom
        [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
 
-       pulsate
        run_scripts /scripts/live-bottom
        [ "${quiet}" != "y" ] && log_end_msg