aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-07-12 02:42:44 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-12 14:47:12 +0800
commit9e8657c451441c95fd0c46db4d19a4e045ab42f0 (patch)
tree6236747a9b77bb9b54096454a7cce09398303b5a
parentc51043a5fe20051bed5b745eeac57a99c0c8ef3e (diff)
downloadmeta-anaconda-9e8657c451441c95fd0c46db4d19a4e045ab42f0.tar.gz
meta-anaconda-9e8657c451441c95fd0c46db4d19a4e045ab42f0.tar.bz2
meta-anaconda-9e8657c451441c95fd0c46db4d19a4e045ab42f0.zip
support luks2 encrypt filesystem
- Add kernel module required by luks2 - Set encypt filesystem to luks2 rather than luks2 by default Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0005-anaconda.conf-set-luks1-for-encrypt-filesystem.patch32
-rwxr-xr-xrecipes-installer/anaconda/python3-anaconda_30.25.6.bb1
-rw-r--r--recipes-installersupport/packagegroups/packagegroup-anaconda-support.bb1
-rw-r--r--recipes-kernel/linux/files/crypt.cfg2
4 files changed, 3 insertions, 33 deletions
diff --git a/recipes-installer/anaconda/files/0005-anaconda.conf-set-luks1-for-encrypt-filesystem.patch b/recipes-installer/anaconda/files/0005-anaconda.conf-set-luks1-for-encrypt-filesystem.patch
deleted file mode 100644
index 695be25..0000000
--- a/recipes-installer/anaconda/files/0005-anaconda.conf-set-luks1-for-encrypt-filesystem.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 411a1878212e813d93b228662d31616ef32ffbe2 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 5 Jul 2019 14:17:50 +0800
-Subject: [PATCH] anaconda.conf: set luks1 for encrypt filesystem
-
-GRUB does not support LUKS2, choose luks1 by default
-
-https://wiki.archlinux.org/index.php/Dm-crypt/Encrypting_an_entire_system
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- data/anaconda.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/anaconda.conf b/data/anaconda.conf
-index 27d046a..703a373 100644
---- a/data/anaconda.conf
-+++ b/data/anaconda.conf
-@@ -124,7 +124,7 @@ default_partitioning = WORKSTATION
- # luks1 Use version 1 by default.
- # luks2 Use version 2 by default.
- #
--luks_version = luks2
-+luks_version = luks1
-
-
- [User Interface]
---
-2.7.4
-
diff --git a/recipes-installer/anaconda/python3-anaconda_30.25.6.bb b/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
index e9e83f4..3246e7c 100755
--- a/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
+++ b/recipes-installer/anaconda/python3-anaconda_30.25.6.bb
@@ -54,7 +54,6 @@ SRC_URI = "git://github.com/rhinstaller/anaconda;protocol=https;branch=f30-relea
file://0002-do-not-load-the-system-wide-Xresources.patch \
file://0003-tweak-iso-mount-dir-and-kernel-name.patch \
file://0004-customize-default-option-for-OE.patch \
- file://0005-anaconda.conf-set-luks1-for-encrypt-filesystem.patch \
file://0006-livepayload-fix-mount-install-tree-failed.patch \
file://0007-dnfpayload.py-customize-for-OE.patch \
file://0009-dynamic-detect-workable-locale.patch \
diff --git a/recipes-installersupport/packagegroups/packagegroup-anaconda-support.bb b/recipes-installersupport/packagegroups/packagegroup-anaconda-support.bb
index 7545e26..38a421b 100644
--- a/recipes-installersupport/packagegroups/packagegroup-anaconda-support.bb
+++ b/recipes-installersupport/packagegroups/packagegroup-anaconda-support.bb
@@ -7,6 +7,7 @@ inherit packagegroup
RDEPENDS_${PN} = " \
sudo \
kernel-image \
+ kernel-modules \
grubby \
shadow \
efibootmgr \
diff --git a/recipes-kernel/linux/files/crypt.cfg b/recipes-kernel/linux/files/crypt.cfg
index 2594462..ca1cec3 100644
--- a/recipes-kernel/linux/files/crypt.cfg
+++ b/recipes-kernel/linux/files/crypt.cfg
@@ -1,2 +1,4 @@
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m