From ee37a0c19acf87c9fc0f0cee8583b0782a9b9152 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 23 Jun 2024 09:02:18 +0200 Subject: [PATCH] ext: fs-cryptroot-support: don't abuse `add_host_dependencies` - use correct hook to make config changes --- extensions/fs-cryptroot-support.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/fs-cryptroot-support.sh b/extensions/fs-cryptroot-support.sh index 6bda8d6f3..e73174a2b 100644 --- a/extensions/fs-cryptroot-support.sh +++ b/extensions/fs-cryptroot-support.sh @@ -5,20 +5,20 @@ function add_host_dependencies__add_cryptroot_tooling() { display_alert "Adding cryptroot to host dependencies" "cryptsetup LUKS" "debug" EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} cryptsetup openssh-client" # @TODO: convert to array later - - display_alert "Adding rootfs encryption related packages" "cryptsetup cryptsetup-initramfs" "info" - add_packages_to_rootfs cryptsetup cryptsetup-initramfs - - if [[ $CRYPTROOT_SSH_UNLOCK == yes ]]; then - display_alert "Adding rootfs encryption related packages" "dropbear-initramfs" "info" - add_packages_to_rootfs dropbear-initramfs - fi } function extension_prepare_config__prepare_cryptroot() { + display_alert "Adding rootfs encryption related packages" "cryptsetup cryptsetup-initramfs" "info" + add_packages_to_image cryptsetup cryptsetup-initramfs + # Config for cryptroot, a boot partition is required. declare -g BOOTPART_REQUIRED=yes EXTRA_IMAGE_SUFFIXES+=("-crypt") + + if [[ $CRYPTROOT_SSH_UNLOCK == yes ]]; then + display_alert "Adding rootfs encryption related packages" "dropbear-initramfs" "info" + add_packages_to_image dropbear-initramfs + fi } function prepare_root_device__encrypt_root_device() {