Adding basic xrandr support for lenny to enforce a particular resolution through...

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 2641487..8970834 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -77,7 +77,7 @@ get_fstype ()
            return
        fi
 
-       eval $(fstype < ${1} 2>/dev/null)
+       eval $(fstype ${1} 2>/dev/null)
 
        if [ "${FSTYPE}" != "unknown" ]
        then
@@ -206,7 +206,7 @@ setup_loop ()
                        dev=$(sys2dev "${loopdev}")
                        options=''
 
-                       if [ -n ${readonly} ]
+                       if [ -n "${readonly}" ]
                        then
                                if losetup --help 2>&1 | grep -q -- "-r\b"
                                then
@@ -275,7 +275,11 @@ try_mount ()
 
        if [ -n "${old_mountp}" ]
        then
-               mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+               if [ "${opts}" != "ro" ]
+               then
+                       mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+               fi
+
                mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
        else
                if [ -z "${fstype}" ]
@@ -288,8 +292,19 @@ try_mount ()
 
 find_cow_device ()
 {
+       # Returns a device containing a partition labeled "${pers_label}" or containing a file named the same way
+       #  in the latter case the partition containing the file is left mounted
+       #  if is not in black_listed_devices
        pers_label="${1}"
        cow_backing="/${pers_label}-backing"
+       black_listed_devices="${2}"
+
+       if [ -z "${PERSISTENT_PATH}" ]
+       then
+               pers_fpath=${cow_backing}/${pers_label}
+       else
+               pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+       fi
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do
@@ -297,20 +312,36 @@ find_cow_device ()
                do
                        devname=$(sys2dev "${dev}")
 
+                       if echo "${black_listed_devices}" | grep -q "${devname}"
+                       then
+                               # skip this device enterely
+                               break
+                       fi
+
                        if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
                        then
                                echo "${devname}"
                                return
                        fi
 
+                       if [ "${PERSISTENT}" = "nofiles" ]
+                       then
+                               # do not mount the device to find for image files
+                               # just skip this
+                               break
+                       fi
+
                        case "$(get_fstype ${devname})" in
                                vfat|ext2|ext3|jffs2)
                                        mkdir -p "${cow_backing}"
-                                       try_mount "${devname}" "${cow_backing}" "rw"
+                                       if ! try_mount "${devname}" "${cow_backing}" "rw"
+                                       then
+                                               break
+                                       fi
 
-                                       if [ -f "${cow_backing}/${pers_label}" ]
+                                       if [ -f "${pers_fpath}" ]
                                        then
-                                               echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+                                               echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
                                                return 0
                                        else
                                                umount ${cow_backing}
@@ -325,11 +356,12 @@ find_cow_device ()
 
 find_files ()
 {
-       # return the first of ${filenames} found on vfat and ext2/ext3 devices
+       # return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
        # FIXME: merge with above function
 
        filenames="${1}"
        snap_backing="/snap-backing"
+       black_listed_devices="${2}"
 
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
        do
@@ -338,6 +370,12 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
+                       if echo "${black_listed_devices}" | grep -q "${devname}"
+                       then
+                               # skip this device enterely
+                               break
+                       fi
+
                        if is_supported_fs ${devfstype}
                        then
                                mkdir -p "${snap_backing}"
@@ -349,7 +387,7 @@ find_files ()
                                                if [ -f "${snap_backing}/${filename}" ]
                                                then
                                                        echo "${devname} ${snap_backing} ${filename}"
-                                                       # return without mounting, it will be umounted later
+                                                       umount ${snap_backing}
                                                        return 0
                                                fi
                                        done