luks: did it work yet?

Let's ensure that make-initrd-luks gets to the base install
until installer is tweaked to enable in-flight installation
of options like this.

Adding luks to stage1 [make-initrd] features makes no sense
on the other hand (and it wasn't happening anyways due to
the lack of add_feature function call in config.mk as was
accidentally spotted).

And putting luks packages into an installer image lacking
the reference to alterator-luks isn't that sensible, let's
complain to logs at the very least (this isn't going to hit
the default output though).
This commit is contained in:
Michael Shigorin 2013-10-14 14:23:51 +04:00
parent 50c72650e2
commit 34df065896
3 changed files with 11 additions and 3 deletions

View File

@ -1,5 +1,7 @@
LUKS_LISTS := $(call tags,security luks)
use/luks:
@$(call add_feature)
@$(call add,BASE_PACKAGES,make-initrd-luks)
@$(call add,THE_LISTS,$(LUKS_LISTS))
@$(call add,RESCUE_LISTS,$(LUKS_LISTS))

View File

@ -0,0 +1,9 @@
#!/bin/sh
# let's check if support is there until installer-steps are dynamic
CONFIG="/usr/share/install2/installer-steps"
if ! grep -q '^luks$' "$CONFIG"; then
PKG="$(rpm -qf "$CONFIG")"
echo "** warning: luks step missing in ${PKG:-$CONFIG}" >&2
fi

View File

@ -1,3 +0,0 @@
#!/bin/sh
echo 'FEATURES += luks' >> /etc/initrd.mk