Merge pull request #42 from fadnincx/fix-disk-encryption

fix: disk encryption not applied
projectpotos · Mar 22, 2023 · 9c03f32 · 9c03f32
2 parents 1dd36d3 + 174b4c6
commit 9c03f32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/container/autoinstall-user-data.j2 b/container/autoinstall-user-data.j2
@@ -53,7 +53,7 @@ autoinstall:
         size: 1GB
         preserve: false
         number: 2
-{% if config['disk_encryption']['enable']  is defined and config['disk_encryption']['enable']  == 'true' %}
+{% if config['disk_encryption']['enable']  is defined and config['disk_encryption']['enable']  == true %}
       - id: partition_crypt
         type: partition
         device: disk_primary
@@ -131,11 +131,11 @@ autoinstall:
         device: format_root
         path: /
         type: mount
-  packages:
+  late-commands:
+    - curtin in-target --target=/target -- apt update
 {% for package in config['packages']['preinstall']  %}
-    - {{ package }}
+    - curtin in-target --target=/target -- apt install {{ package }} -y
 {% endfor %}
-  late-commands:
     - |
       for arg in $(cat /proc/cmdline); do
         case "${arg}" in

diff --git a/container/build-iso.py b/container/build-iso.py
@@ -81,12 +81,12 @@
     config['input']['sha256_url'] = "https://releases.ubuntu.com/20.04/SHA256SUMS"
     config['packages'] = {}
     config['packages']['preinstall'] = [
-        "python3-virtualenv",
         "linux-generic-hwe-20.04",
         "ubuntu-desktop",
         "plymouth-theme-ubuntu-logo",
         "ldap-utils",
         "yad",
+        "python3-virtualenv",
     ]
 else:
     print("Invalid base os: %s"%(config['os']))