From 1f7bd1a28ae4d255617e800c1f835c8da09cc1c6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 24 Feb 2022 16:27:32 -0500 Subject: [PATCH] Fix autoconsole output on diskless --- .../usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index 8a381541..0ec82763 100644 --- a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -8,7 +8,7 @@ get_remote_apikey() { confluent_apikey=$(cat /etc/confluent/confluent.apikey) if [ -z "$confluent_apikey" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." - if [ ! -z "$autocons" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." > $autocons; fi + if [ ! -z "$autoconsdev" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." > $autoconsdev; fi sleep 10 elif [ -c /dev/tpmrm0 ]; then tmpdir=$(mktemp -d) @@ -39,6 +39,7 @@ echo sshd:x:30:30:SSH User:/var/empty/sshd:/sbin/nologin >> /etc/passwd if ! grep console= /proc/cmdline >& /dev/null; then autocons=$(/opt/confluent/bin/autocons) + autoconsdev=${autocons%,*} autocons=${autocons##*/} echo "Automatic console configured for $autocons" fi @@ -134,7 +135,7 @@ while [ $ready = "0" ]; do confluent_mgr=${confluent_mgr#[} confluent_mgr=${confluent_mgr%]} echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' - if [ ! -z "$autocons" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autocons; fi + if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi sleep 1 else ready=1