From faafedb2a29fe2ff0182c366ea07cd5987e299eb Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Sun, 26 Nov 2017 15:51:23 -0600
Subject: [PATCH] Some more partition management customizations and (hopefully)
 proper LUKS support.

---
 lubuntu/modules/fstab.conf     | 10 ++++++++++
 lubuntu/modules/packages.conf  |  1 +
 lubuntu/modules/partition.conf |  5 ++++-
 lubuntu/settings.conf          |  4 +---
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 lubuntu/modules/fstab.conf

diff --git a/lubuntu/modules/fstab.conf b/lubuntu/modules/fstab.conf
new file mode 100644
index 0000000..024cb4d
--- /dev/null
+++ b/lubuntu/modules/fstab.conf
@@ -0,0 +1,10 @@
+mountOptions:
+    default: defaults
+    btrfs: defaults,noatime,space_cache,autodefrag
+ssdExtraMountOptions:
+    ext4: discard
+    jfs: discard
+    xfs: discard
+    swap: discard
+    btrfs: discard,compress=lzo
+crypttabOptions: luks,keyscript=/bin/cat
diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf
index 870be77..214696c 100644
--- a/lubuntu/modules/packages.conf
+++ b/lubuntu/modules/packages.conf
@@ -1,4 +1,5 @@
 backend: apt
+update_db: true
 
 operations:
   - remove:
diff --git a/lubuntu/modules/partition.conf b/lubuntu/modules/partition.conf
index 86987f8..955b5dc 100644
--- a/lubuntu/modules/partition.conf
+++ b/lubuntu/modules/partition.conf
@@ -1 +1,4 @@
-enableLuksAutomatedPartitioning: true
+efiSystemPartition: "/boot/efi"
+enableLuksAutomatedPartitioning: false
+neverCreateSwap: true
+drawNestedPartitions: true
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index b31a27a..03f3cf0 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -19,14 +19,12 @@ sequence:
   - keyboard
   - localecfg
   - luksbootkeyfile
-  - luksopenswaphookcfg
-  - initcpiocfg
-  - initcpio
   - users
   - displaymanager
   - networkcfg
   - hwclock
   - services
+  - initramfscfg
   - initramfs
   - bootloader
   - packages