From dad68bdf63ab5d1643853534dbb42cf48e3eab92 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 14 Jul 2020 14:40:05 -0400
Subject: [PATCH] Conditionally include clevis-dracut

If not using LUKS, don't bother with clevis-dracut.

In 8.1, clevis-dracut will cause problems with network
in initrd time.
---
 confluent_osdeploy/el8/profiles/default/kickstart      | 2 +-
 confluent_osdeploy/el8/profiles/default/scripts/pre.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/confluent_osdeploy/el8/profiles/default/kickstart b/confluent_osdeploy/el8/profiles/default/kickstart
index 4f35e9a7..09222e97 100644
--- a/confluent_osdeploy/el8/profiles/default/kickstart
+++ b/confluent_osdeploy/el8/profiles/default/kickstart
@@ -34,10 +34,10 @@ reboot
 
 %packages
 @^minimal-environment
-clevis-dracut
 chrony
 rsync
 python3
+%include /tmp/cryptpkglist
 %end
 
 %pre
diff --git a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh
index cd740bf9..e36ead25 100644
--- a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh
+++ b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh
@@ -46,9 +46,11 @@ if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then
 fi
 cryptboot=$(grep ^encryptboot: /etc/confluent/confluent.deploycfg | awk '{print $2}')
 LUKSPARTY=''
+touch /tmp/cryptpkglist
 if [ "$cryptboot" == "tpm2" ]; then
 	LUKSPARTY="--encrypted --passphrase=$(cat /etc/confluent/confluent.apikey)"
 	echo $cryptboot >> /tmp/cryptboot
+	echo clevis-dracut >> /tmp/cryptpkglist
 fi