Merge ~therealchjones/casper:supported-fs into casper:main

[Christian Jones]

removes redundant is_supported_fs, adds udf

Commit 28b7525e3bb3ac0ab5dfefa045e2d10dbd01bfbd added is_supported_fs, overriding previously defined is_supported_fs and removing udf (which works) from the list of supported filesystems. This removes the now-unused earlier definition of is_supported_fs and adds udf back into the supported filesystem list, allowing installation/live boot again from UDF filesystem.

[Michael Hudson-Doyle (mwhudson)]

Oops. It looks like your patch removes jfs and reiserfs from the set of supported filesystems, does it make sense to merge the lists from the two implementations instead?

[Christian Jones (therealchjones)]

Yes, I think that’s what I’ve done. The only fs in the function at line 35 that’s not in the function at line 361 is udf. I added that to the list in the function at line 361, then removed the whole function at 35. (As it’s defined first, that’s the one that hasn’t been running, of course.) unless I’ve made some very silly mistake in the merge request (which is always possible), the result should be a minimally modified version of the function that’s otherwise been working properly and removal of the function that’s been overridden since the previous commit. Did I screw it up somehow?

[Michael Hudson-Doyle (mwhudson)]

oh sorry read too quickly, I'll merge this.

review: Approve

[Christian Jones (therealchjones)]

Oh, thank goodness! I was afraid I’d messed up my first contrib on lp. Thanks again!

diff --git a/scripts/casper-helpers b/scripts/casper-helpers
index 0c9ee5b..584dac2 100644
--- a/scripts/casper-helpers
+++ b/scripts/casper-helpers
@@ -32,17 +32,6 @@ 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|ext4|btrfs|ntfs)
-            return 0
-            ;;
-    esac
-    return 1
-}
-
 get_fstype() {
     local FSTYPE
     local FSSIZE
@@ -361,7 +350,7 @@ find_files()
 is_supported_fs(){
     [ -z "${1}" ] && return 1
     case ${1} in
-        ext2|ext3|ext4|xfs|jfs|reiserfs|vfat|ntfs|iso9660|btrfs)
+        ext2|ext3|ext4|xfs|jfs|reiserfs|vfat|ntfs|iso9660|btrfs|udf)
             return 0
             ;;
     esac