diff options
| author | Tails developers <amnesia@boum.org> | 2011-11-09 20:06:28 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-24 09:42:08 +0100 |
| commit | 5748431e0be129d18226eff9aff736f3eadc34fd (patch) | |
| tree | 12ec98822fa2882754ac45fb38d4fb7ca58317de /scripts | |
| parent | 96921bdecf7f64923686e17114b6ef63e0f46245 (diff) | |
| download | live-boot-5748431e0be129d18226eff9aff736f3eadc34fd.tar.gz live-boot-5748431e0be129d18226eff9aff736f3eadc34fd.zip | |
Making use of is_supported_fs in find_cow_devices (like in find_files).
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers index 90fa3b4..a9c4fbe 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -388,23 +388,22 @@ find_cow_device () continue fi - case "$(get_fstype ${dev})" in - vfat|ext2|ext3|ext4|jffs2) - mkdir -p "${cow_backing}" - if try_mount "${dev}" "${cow_backing}" "rw" + devfstype="$(get_fstype ${dev})" + + if is_supported_fs ${devfstype} + then + mkdir -p "${cow_backing}" + if try_mount "${dev}" "${cow_backing}" "rw" + then + if [ -f "${pers_fpath}" ] then - if [ -f "${pers_fpath}" ] - then - echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*") - return 0 - else - umount ${cow_backing} > /dev/null 2>&1 || true - fi + echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*") + return 0 + else + umount ${cow_backing} > /dev/null 2>&1 || true fi - ;; - *) - ;; - esac + fi + fi done return 1 } |