diff --git a/anaconda/0020-anaconda-don-t-force-non-encrypted-boot-on-coreboot-.patch b/anaconda/0020-anaconda-add-skip_grub-parameter-and-allow-boot-encr.patch similarity index 87% rename from anaconda/0020-anaconda-don-t-force-non-encrypted-boot-on-coreboot-.patch rename to anaconda/0020-anaconda-add-skip_grub-parameter-and-allow-boot-encr.patch index e41ed24..3bf8474 100644 --- a/anaconda/0020-anaconda-don-t-force-non-encrypted-boot-on-coreboot-.patch +++ b/anaconda/0020-anaconda-add-skip_grub-parameter-and-allow-boot-encr.patch @@ -2,16 +2,14 @@ From fd7575cbd24f9f72447755995cd9e6694e23f149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 19 Oct 2018 08:02:12 +0200 -Subject: [PATCH] anaconda: don't force non-encrypted /boot on coreboot systems +Subject: [PATCH] anaconda: add skip_grub parameter and allow boot encryption and the lvmlv format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -With grub payload it is possible to have all the partitions encrypted. +On coreboot systems, as grub2 can be used a payload it is possible to have all the partitions encrypted. -Based on patch by @tlaurion - -Fixes QubesOS/qubes-issues#2118 +Based on commits bf803e7 and 62cb1ca. Signed-off-by: Frédéric Pierret --- diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec index d857f7d..47027f9 100644 --- a/anaconda/anaconda.spec +++ b/anaconda/anaconda.spec @@ -37,7 +37,7 @@ Patch16: 0016-anaconda-Do-not-fail-during-initramfs-start-up-due-t.patch Patch17: 0017-anaconda-Disable-the-NTP-configuration-spoke.patch Patch18: 0018-anaconda-drop-useless-on-Qubes-dependencies-on-netwo.patch Patch19: 0019-anaconda-skip-NTP-installation-and-setup-in-dom0.patch -Patch20: 0020-anaconda-don-t-force-non-encrypted-boot-on-coreboot-.patch +Patch20: 0020-anaconda-add-skip_grub-parameter-and-allow-boot-encr.patch Patch21: 0021-anaconda-switch-default-partitioning-scheme-to-LVM-T.patch Patch22: 0022-anaconda-add-console-none-Xen-parameter.patch Patch23: 0023-anaconda-add-dom0_mem-min-1024M-to-default-xen-cmdli.patch