Set default cow_mountopt where the other defaults are used.

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 3c89c95..f99fa56 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -29,6 +29,20 @@ subdevices ()
        echo ${r}
 }
 
+is_supported_fs ()
+{
+       # FIXME: do something better like the scan of supported filesystems
+       fstype="${1}"
+
+       case ${fstype} in
+               vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
+               return 0
+               ;;
+       esac
+
+       return 1
+}
+
 get_fstype ()
 {
        local FSTYPE
@@ -58,12 +72,9 @@ where_is_mounted ()
 
        if grep -q "^${device} " /proc/mounts
        then
-               grep "^${device} " /proc/mounts | read d mountpoint rest
-               echo ${mountpoint}
-               return 0
+               # return the first found
+               grep "^${device} " /proc/mounts | cut -f2 -d ' '
        fi
-
-       return 1
 }
 
 lastline ()
@@ -106,9 +117,9 @@ fs_size ()
 
        if [ -z "${mountp}" ]
        then
-               mountp=$(where_is_mounted "${dev}")
+               mountp="$(where_is_mounted ${dev})"
 
-               if [ "${?}" -gt 0 ]
+               if [ -z "${mountp}" ]
                then
                        mountp="/mnt/tmp_fs_size"
 
@@ -153,6 +164,7 @@ setup_loop ()
        local pattern=${3}
        local offset=${4}
        local encryption=${5}
+       local readonly=${6}
 
        modprobe -q -b "${module}"
        udevsettle
@@ -164,6 +176,14 @@ setup_loop ()
                        dev=$(sys2dev "${loopdev}")
                        options=''
 
+                       if [ -n ${readonly} ]
+                       then
+                               if losetup --help 2>&1 | grep -q -- "-r\b"
+                               then
+                                       options="${options} -r"
+                               fi
+                       fi
+
                        if [ 0 -lt "${offset}" ]
                        then
                                options="${options} -o ${offset}"
@@ -220,10 +240,12 @@ try_mount ()
        mountp="${2}"
        opts="${3}"
 
-       if where_is_mounted ${dev} > /dev/null
+       old_mountp="$(where_is_mounted ${dev})"
+
+       if [ -n "${old_mountp}" ]
        then
-               mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-               mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+               mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+               mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
        else
                mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
        fi
@@ -281,24 +303,22 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       case "${devfstype}" in
-                               vfat|ext2|ext3|jffs2)
-                                       # FIXME: all supported block devices should be scanned
-                                       mkdir -p "${snap_backing}"
-                                       try_mount "${devname}" "${snap_backing}" "ro"
+                       if is_supported_fs ${devfstype}
+                       then
+                               mkdir -p "${snap_backing}"
+                               try_mount "${devname}" "${snap_backing}" "ro"
 
-                                       for filename in ${filenames}
+                               for filename in ${filenames}
                                        do
-                                               if [ -f "${snap_backing}/${filename}" ]
-                                               then
-                                                       echo "${devname} ${snap_backing} ${filename}"
-                                                       return 0
-                                               fi
-                                       done
-
-                                       umount ${snap_backing}
-                                       ;;
-                       esac
+                                       if [ -f "${snap_backing}/${filename}" ]
+                                       then
+                                               echo "${devname} ${snap_backing} ${filename}"
+                                               return 0
+                                       fi
+                               done
+
+                               umount ${snap_backing}
+                       fi
                done
        done
 }