From 6db75e1ae8c968b2f5a69ca8dcd9ef122c9abfb4 Mon Sep 17 00:00:00 2001
From: Walter Lapchynski <wxl@ubuntu.com>
Date: Thu, 4 Oct 2018 22:04:04 -0700
Subject: [PATCH] Enable support for LUKS/encryption.

Summary: All settings required to enable support for LUKS/encryption.

Test Plan:
The two methods of encryption will need to be tested:

 1. Automated option, e.g. Erase Disk
    1. Click the radio button for the option
    1. Check the Encrypt checkbox
    1. Enter your password twice
    1. Continue with the install as normal
 1. Manual partitioning
    1. Create a new partition
    1. Check the Encrypt checkbox underneath filesystem
    1. Enter your password twice
    1. Don't forget to mount as /
    1. Continue with the install as normal

If the install completes without errors and can boot successfully after completion, asking for and accepting the correct password before booting the system, then we've got ourselves a winner.

Reviewers: tsimonq2

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D28
---
 debian/changelog               | 6 ++++++
 lubuntu/modules/grubcfg.conf   | 3 +++
 lubuntu/modules/packages.conf  | 1 +
 lubuntu/modules/partition.conf | 2 +-
 lubuntu/settings.conf          | 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 lubuntu/modules/grubcfg.conf

diff --git a/debian/changelog b/debian/changelog
index 85db081..0c820f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (22) cosmic; urgency=medium
+
+  * Lubuntu: enable LUKS/encryption. 
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Thu, 04 Oct 2018 22:02:57 -0700
+
 calamares-settings-ubuntu (21) cosmic; urgency=medium
 
   * Lubuntu: remove all password checking.
diff --git a/lubuntu/modules/grubcfg.conf b/lubuntu/modules/grubcfg.conf
new file mode 100644
index 0000000..2714306
--- /dev/null
+++ b/lubuntu/modules/grubcfg.conf
@@ -0,0 +1,3 @@
+overwrite: false
+defaults:
+    GRUB_ENABLE_CRYPTODISK: true
diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf
index baad3a2..b6f0669 100644
--- a/lubuntu/modules/packages.conf
+++ b/lubuntu/modules/packages.conf
@@ -1,6 +1,7 @@
 backend: apt
 operations:
   - remove:
+      - '^live-*'
       - "calamares-settings-lubuntu"
       - "calamares"
       - "hunspell-en-us"
diff --git a/lubuntu/modules/partition.conf b/lubuntu/modules/partition.conf
index 955b5dc..4a75579 100644
--- a/lubuntu/modules/partition.conf
+++ b/lubuntu/modules/partition.conf
@@ -1,4 +1,4 @@
 efiSystemPartition: "/boot/efi"
-enableLuksAutomatedPartitioning: false
+enableLuksAutomatedPartitioning: true
 neverCreateSwap: true
 drawNestedPartitions: true
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index 6b44310..b5985ac 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -32,11 +32,14 @@ sequence:
   - locale
   - keyboard
   - localecfg
+  - luksbootkeyfile
   - users
   - displaymanager
   - networkcfg
   - hwclock
+  - initramfscfg
   - initramfs
+  - grubcfg
   - contextualprocess@before_bootloader_mkdirs
   - contextualprocess@before_bootloader
   - bootloader