Moved mount options from fstab.conf to mount.conf for Calamares 3.3.0 compatibility.

lubuntu/modules/fstab.conf

@@ -1,11 +1,2 @@
-mountOptions:
-    default: defaults
-    btrfs: defaults,noatime,autodefrag
-ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
 crypttabOptions: luks,keyscript=/bin/cat
 efiMountOptions: umask=0077

lubuntu/modules/mount.conf

@@ -7,15 +7,29 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: bind
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: bind
-
-extraMountsEfi:
+      options: [ bind ]
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+      efi: true
+
+mountOptions:
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: btrfs
+      options: [ defaults, noatime, autodefrag ]
+      ssdOptions: [ discard, compress=lzo ]
+    - filesystem: ext4
+      ssdOptions: [ discard ]
+    - filesystem: jfs
+      ssdOptions: [ discard ]
+    - filesystem: xfs
+      ssdOptions: [ discard ]
+    - filesystem: swap
+      ssdOptions: [ discard ]