From 99cb4748a7e9a714593bf3a06834fdeab43bf53e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 15 Jul 2020 15:29:30 -0400 Subject: [PATCH] Also amend the RHVH4 dracut hook In addition to RHEL8, also have RHVH4 have the workaround. --- .../initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/confluent_osdeploy/rhvh4/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/rhvh4/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh index 1c909f2c..46160b31 100644 --- a/confluent_osdeploy/rhvh4/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh +++ b/confluent_osdeploy/rhvh4/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh @@ -2,7 +2,6 @@ [ -e /tmp/confluent.initq ] && return 0 mkdir -p /etc/confluent cat /tls/*.pem > /etc/confluent/ca.pem -echo -n "" > /tmp/confluent.initq TRIES=0 echo -n > /etc/confluent/confluent.info cd /sys/class/net @@ -14,6 +13,10 @@ while ! awk -F'|' '{print $3}' /etc/confluent/confluent.info |grep 1 >& /dev/nul /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info done cd / +grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && echo -n "" > /tmp/confluent.initq +grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0 # Do absolutely nothing if no data at all yet +if [ -f /tmp/confluent.fellback ] && [ ! -f /tmp/confluent.initq ]; return 0; fi +echo -n "" > /tmp/confluent.fellback nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') #TODO: blkid --label to find mounted api