From 36d8984d9632aaa957a98408f8f4c0777b60dc00 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Thu, 31 Oct 2024 09:49:55 -0600
Subject: [PATCH] Minor refactor of wwinit and build-ipxe scripts

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 overlays/wwinit/rootfs/warewulf/wwinit | 16 ++++------------
 scripts/build-ipxe.sh                  | 14 +++-----------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/overlays/wwinit/rootfs/warewulf/wwinit b/overlays/wwinit/rootfs/warewulf/wwinit
index 4f875b92..1302c042 100755
--- a/overlays/wwinit/rootfs/warewulf/wwinit
+++ b/overlays/wwinit/rootfs/warewulf/wwinit
@@ -5,21 +5,13 @@ echo "Hello from WWINIT"
 . /warewulf/config
 
 myPATH=/warewulf/init.d
-while read -r NAME; do
-#        if [ -x $myPATH/$NAME ]
-#        then
-               echo "Launching: $NAME"
-               sh "$myPATH/$NAME"
-
-#        fi
-done <<EOF
-# `ls $myPATH/*.sh`
-`ls $myPATH/`
-EOF
+ls -1 $myPATH/ | while read -r NAME; do
+    echo "Launching: $NAME"
+    sh "$myPATH/$NAME"
+done
 
 echo "Calling $WWINIT..."
 echo
 
 sleep 2
 exec $WWINIT
-
diff --git a/scripts/build-ipxe.sh b/scripts/build-ipxe.sh
index 40831e7f..1b09c9e5 100755
--- a/scripts/build-ipxe.sh
+++ b/scripts/build-ipxe.sh
@@ -3,10 +3,6 @@
 set -e
 
 TARGETS=${TARGETS:-"bin-x86_64-pcbios/undionly.kpxe bin-x86_64-efi/snponly.efi bin-arm64-efi/snponly.efi"}
-TARGS="bin-x86_64-pcbios/undionly.kpxe
-bin-x86_64-efi/snponly.efi
-bin-arm64-efi/snponly.efi"
-
 IPXE_BRANCH=${IPXE_BRANCH:-master}
 DESTDIR=${DESTDIR:-/usr/local/share/ipxe}
 
@@ -43,7 +39,8 @@ main() {
 
   cd ipxe/src
 
-while read -r target; do
+  echo $TARGETS | sed 's/  */\n/g' | while read -r target
+  do
     if $(echo "$target" | grep -q "\-arm64-")
     then
       if ! which aarch64-linux-gnu-gcc >/dev/null 2>&1
@@ -60,17 +57,13 @@ while read -r target; do
     destname=$(echo $target | tr / -)
     make -j $CPUS CROSS="${CROSS}" $target "$@" && cp -v $target ${DESTDIR}/${destname}
     restore_config
-
-done <<EOF
-$TARGS
-EOF
+  done
 }
 
 
 configure_arm64() {
   # CONSOLE_SERIAL causes build failure for aarch64, so omitting here
   # https://github.com/ipxe/ipxe/issues/658
-  ls -l config >> /root/args
   sed -i.bak \
       -e 's,//\(#define.*CONSOLE_FRAMEBUFFER.*\),\1,' \
       config/console.h
@@ -84,7 +77,6 @@ configure_arm64() {
 
 
 configure_x86_64() {
-  ls -l config >> /root/args
   sed -i.bak \
       -e 's,//\(#define.*CONSOLE_SERIAL.*\),\1,' \
       -e 's,//\(#define.*CONSOLE_FRAMEBUFFER.*\),\1,' \