2
0
mirror of https://github.com/xcat2/confluent.git synced 2026-11-18 16:32:18 +00:00

Fix 'grep true' error in suse boots

This commit is contained in:
Jarrod Johnson
2026-11-04 11:48:45 -05:00
parent 8b646b5728
commit dbdb9e062e
4 changed files with 4 additions and 4 deletions
@@ -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}
@@ -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
@@ -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
@@ -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