From dbdb9e062ebe11a766e06355bd7ce9058838faf0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 4 Nov 2026 11:48:45 -0500 Subject: [PATCH] Fix 'grep true' error in suse boots --- .../usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 2 +- .../initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 2 +- confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent | 2 +- .../var/lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/confluent_osdeploy/el7-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el7-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index bec6e648..b38955f7 100644 --- a/confluent_osdeploy/el7-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el7-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -165,7 +165,7 @@ while [ $ready = "0" ]; do fi rm $tmperr done -if [ ! -z "$autocons" ] && grep textconsole: true /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi +if [ ! -z "$autocons" ] && grep 'textconsole: true' /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi if [ -c /dev/tpmrm0 -a -x /usr/bin/tpm2_pcrextend ]; then set_tpm_hashalgo tpm2_pcrextend 15:${pcrhashalgo}=${pcrextendvalue} diff --git a/confluent_osdeploy/suse15-diskless/initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/suse15-diskless/initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index 4892a185..3723ad39 100644 --- a/confluent_osdeploy/suse15-diskless/initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/suse15-diskless/initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -165,7 +165,7 @@ while [ $ready = "0" ]; do fi rm $tmperr done -if [ ! -z "$autocons" ] && grep textconsole: true /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi +if [ ! -z "$autocons" ] && grep 'textconsole: true' /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi set_tpm_hashalgo tpm2_pcrextend 15:${pcrhashalgo}=${pcrextendvalue} umask $oldumask diff --git a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent index b18782af..9b26dfdf 100755 --- a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent +++ b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent @@ -157,7 +157,7 @@ if [ -z "$mgtiface" ]; then else curl -H "CONFLUENT_MGTIFACE: $mgtiface" -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg fi -if [ ! -z "$autocons" ] && grep textconsole: true /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi +if [ ! -z "$autocons" ] && grep 'textconsole: true' /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi profilename=$(grep ^profile: /etc/confluent/confluent.deploycfg) profilename=${profilename#profile: } curl https://$mgr/confluent-public/os/$profilename/profile.yaml > /tmp/profile.yaml diff --git a/confluent_osdeploy/suse16-diskless/initramfs/var/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/suse16-diskless/initramfs/var/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index 06f65314..efadb2d0 100644 --- a/confluent_osdeploy/suse16-diskless/initramfs/var/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/suse16-diskless/initramfs/var/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -219,7 +219,7 @@ while [ $ready = "0" ]; do fi rm $tmperr done -if [ ! -z "$autocons" ] && grep textconsole: true /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi +if [ ! -z "$autocons" ] && grep 'textconsole: true' /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi set_tpm_hashalgo tpm2_pcrextend 15:${pcrhashalgo}=${pcrextendvalue} umask $oldumask