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).

luks: did it work yet?
34df0658 · Michael Shigorin · 50c72650 · 34df0658 · 34df0658 · 50c72650
Commit 34df0658 authored Oct 14, 2013 by Michael Shigorin
Showing with 11 additions and 3 deletions

config.mk features.in/luks/config.mk +2 -0

50-check-luks features.in/luks/install2/image-scripts.d/50-check-luks +9 -0

11-initrd-luks features.in/luks/stage1/scripts.d/11-initrd-luks +0 -3

No files found.
--- a/features.in/luks/config.mk
+++ b/features.in/luks/config.mk
 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))
--- a/features.in/luks/install2/image-scripts.d/50-check-luks
+++ b/features.in/luks/install2/image-scripts.d/50-check-luks
+#!/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
--- a/features.in/luks/stage1/scripts.d/11-initrd-luks
+++ b/features.in/luks/stage1/scripts.d/11-initrd-luks
-#!/bin/sh
-
-echo 'FEATURES += luks' >> /etc/initrd.mk