Skip to content

Commit ee37a0c

Browse files
rpardiniigorpecovnik
authored andcommitted
ext: fs-cryptroot-support: don't abuse add_host_dependencies
- use correct hook to make config changes
1 parent e797126 commit ee37a0c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

extensions/fs-cryptroot-support.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
function add_host_dependencies__add_cryptroot_tooling() {
66
display_alert "Adding cryptroot to host dependencies" "cryptsetup LUKS" "debug"
77
EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} cryptsetup openssh-client" # @TODO: convert to array later
8-
9-
display_alert "Adding rootfs encryption related packages" "cryptsetup cryptsetup-initramfs" "info"
10-
add_packages_to_rootfs cryptsetup cryptsetup-initramfs
11-
12-
if [[ $CRYPTROOT_SSH_UNLOCK == yes ]]; then
13-
display_alert "Adding rootfs encryption related packages" "dropbear-initramfs" "info"
14-
add_packages_to_rootfs dropbear-initramfs
15-
fi
168
}
179

1810
function extension_prepare_config__prepare_cryptroot() {
11+
display_alert "Adding rootfs encryption related packages" "cryptsetup cryptsetup-initramfs" "info"
12+
add_packages_to_image cryptsetup cryptsetup-initramfs
13+
1914
# Config for cryptroot, a boot partition is required.
2015
declare -g BOOTPART_REQUIRED=yes
2116
EXTRA_IMAGE_SUFFIXES+=("-crypt")
17+
18+
if [[ $CRYPTROOT_SSH_UNLOCK == yes ]]; then
19+
display_alert "Adding rootfs encryption related packages" "dropbear-initramfs" "info"
20+
add_packages_to_image dropbear-initramfs
21+
fi
2222
}
2323

2424
function prepare_root_device__encrypt_root_device() {

0 commit comments

Comments
 (0)