From a2b2c8a9954226bc098619d36d0a5f76eb655ed5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 24 Jun 2021 15:57:03 -0400 Subject: [PATCH] Remove extraneous '/' output Suppress output of cd -, as it's a bit odd during boot. --- .../usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 4 ++-- .../genesis/initramfs/opt/confluent/bin/rungenesis | 4 ++-- .../lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 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 d0d4b790..f5e0a745 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 @@ -19,7 +19,7 @@ get_remote_apikey() { tpm2_load -Q --parent-context=prim.ctx --public=data.pub --private=data.priv --name=confluent.apikey --key-context=data.ctx tpm2_evictcontrol -Q -c data.ctx tpm2_flushcontext session.ctx - cd - + cd - > /dev/null rm -rf $tmpdir fi done @@ -86,7 +86,7 @@ for hdl in $(tpm2_getcap handles-persistent|awk '{print $2}'); do lasthdl=$hdl fi done -cd - +cd - > /dev/null rm -rf $tpmdir touch /etc/confluent/confluent.info cd /sys/class/net diff --git a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis index 6c8a0180..4c8768d8 100644 --- a/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis +++ b/confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis @@ -74,7 +74,7 @@ for hdl in $(tpm2_getcap handles-persistent|awk '{print $2}'); do lasthdl=$hdl fi done -cd - +cd - > /dev/null rm -rf $tpmdir /usr/libexec/platform-python /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg umask $oldumask @@ -92,7 +92,7 @@ if [ "$new_apikey" != "$confluent_apikey" ]; then tpm2_load -Q --parent-context=prim.ctx --public=data.pub --private=data.priv --name=confluent.apikey --key-context=data.ctx tpm2_evictcontrol -Q -c data.ctx tpm2_flushcontext session.ctx - cd - + cd - > /dev/null rm -rf $tmpdir fi tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2 2> /dev/null 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 b4824538..d5ca965f 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 @@ -19,7 +19,7 @@ get_remote_apikey() { tpm2_load -Q --parent-context=prim.ctx --public=data.pub --private=data.priv --name=confluent.apikey --key-context=data.ctx tpm2_evictcontrol -Q -c data.ctx tpm2_flushcontext session.ctx - cd - + cd - > /dev/null rm -rf $tmpdir fi done @@ -87,7 +87,7 @@ for hdl in $(tpm2_getcap handles-persistent|awk '{print $2}'); do lasthdl=$hdl fi done -cd - +cd - > /dev/null rm -rf $tpmdir touch /etc/confluent/confluent.info cd /sys/class/net