From d3fd961e2fcbe69033a2d8d8559cc5af88ff5295 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Sat, 2 Sep 2023 15:39:30 +1000
Subject: [PATCH] minir bug fixes

---
 install-koji-farm.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/install-koji-farm.sh b/install-koji-farm.sh
index 548f05f..f8007fc 100644
--- a/install-koji-farm.sh
+++ b/install-koji-farm.sh
@@ -33,7 +33,11 @@ curl $SILENT $SCRIPT_GIT/deploy-koji.sh > $SCRIPT_DIR/deploy-koji.sh
 curl $SILENT $SCRIPT_GIT/bootstrap-build.sh > $SCRIPT_DIR/bootstrap-build.sh
 chmod o+x $SCRIPT_DIR/*.sh
 
+# install any required packages
+dnf install -y netcat $QUIET
+
 # ask for required parameters (ssh settings and build server FQDN)
+KOJID_CAPACITY=16
 KOJI_HUB_FQDN="$(hostname -f)"
 while true ; do
     read -p "Country Code (eg, US) " COUNTRY_CODE
@@ -80,9 +84,8 @@ cat > $SCRIPT_DIR/parameters.sh <<- EOT
 ## KOJI RPM BUILD AND TRACKER
 export KOJI_DIR=/mnt/koji
 export KOJI_HUB_FQDN="$KOJI_HUB_FQDN"
-export KOJI_BUILD_FQDN="$KOJI_BUILD_FQDN"
 export KOJI_URL=http://"$KOJI_HUB_FQDN"
-export KOJID_CAPACITY=16
+export KOJID_CAPACITY=$KOJID_CAPACITY
 export TAG_NAME=sme
 # Use for koji SSL certificates
 export COUNTRY_CODE='$COUNTRY_CODE'
@@ -141,11 +144,13 @@ while true ; do
                 ;;
             IP=* )
                 BIP=${RESPONSE#*=}
+                # add this builder into the hosts file
                 echo "$BIP  $KOJI_BUILD_FQDN\n" >> /etc/hosts
                 continue 
                 ;;
             FQDN=* )
                 KOJI_BUILD_FQDN=${RESPONSE#*=}
+                continue
                 ;;
             *)
                 continue
@@ -204,7 +209,7 @@ while true ; do
     ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-nfs-client.sh
     # deploy koji builder
     ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-builder.sh
-fi
+done
 
 # 
 bootstrap-build.sh
\ No newline at end of file