From 0c3888441d992263cae273128e8f9bae386fbc20 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 30 Jun 2020 18:48:10 -0400 Subject: [PATCH] Add the check for primary nic to suse --- .../initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh | 2 +- .../suse15/initramfs/opt/confluent/bin/suseagent | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh index ec15028e..85496b9e 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh @@ -2,7 +2,7 @@ [ -e /tmp/confluent.initq ] && return 0 echo -n "" > /tmp/confluent.initq TRIES=0 -while ! awk -F'|' '{print $3}' /tmp/confluent.info |grep 2 >& /dev/null && [ "$TRIES" -lt 60 ]; do +while ! awk -F'|' '{print $3}' /tmp/confluent.info |grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do TRIES=$((TRIES + 1)) cd /sys/class/net for currif in *; do diff --git a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent index 0e7316ea..53190750 100755 --- a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent +++ b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent @@ -21,7 +21,10 @@ for nic in *; do done echo -n "Discovering confluent..." /opt/confluent/bin/copernicus -t > /tmp/confluent.info -while ! grep MANAGER: /tmp/confluent.info > /dev/null; do +TRIES=0 +while ! awk -F'|' '{print $3}' /tmp/confluent.info |grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do + TRIES=$((TRIES + 1)) + /opt/confluent/bin/copernicus -t > /tmp/confluent.info done nodename=$(grep ^NODENAME: /tmp/confluent.info | head -n 1 | sed -e 's/NODENAME: //')