Making use of is_supported_fs in find_cow_devices (like in find_files).
authorTails developers <amnesia@boum.org>
Wed, 9 Nov 2011 19:06:28 +0000 (20:06 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 24 Nov 2011 08:42:08 +0000 (09:42 +0100)
scripts/live-helpers

index 90fa3b4..a9c4fbe 100644 (file)
@@ -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
 }