From 55a796af82feb578e03facf59a4de49912d9f43c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 12 Apr 2023 13:23:39 -0400 Subject: [PATCH] Correct some errors in the Ubuntu 18 support An ommited end clause as well as some bashisms. --- .../lib/debian-installer-startup.d/S25confluentinit | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit b/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit index dd629f02..b1099743 100644 --- a/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit +++ b/confluent_osdeploy/ubuntu18.04/initramfs/lib/debian-installer-startup.d/S25confluentinit @@ -43,9 +43,10 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then autoconfigmethod=${autoconfigmethod#ipv4_method: } for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK|cut -d ' ' -f 2 | sed -e 's/:$//'); do for dsrv in $deploysrvs; do - if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null >& /dev/null; then + if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null > /dev/null 2>&1; then deploysrvs=$dsrv NIC=$NICGUESS + fi done done deploysrvs=$dsrv @@ -69,7 +70,7 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then ip route add default via $v4gw fi for dsrv in $deploysrvs; do - if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null >& /dev/null; then + if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null > /dev/null 2>&1; then deploysrvs=$dsrv NIC=$NICGUESS setdebopt netcfg/choose_interface $NIC select @@ -90,7 +91,7 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then udhcpc $NICGUESS done for dsrv in $deploysrvs; do - if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null >& /dev/null; then + if wget https://$dsrv/confluent-public/ --tries=1 --timeout=1 -O /dev/null > /dev/null 2>&1; then deploysrvs=$dsrv fi done