X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=a3df1a5953846368397e9b335be844970b132771;hb=187171cf7e0b0ef3fa07458a3536f98074416c0a;hp=9e74eeb757a030c9a367fabb3c8440597188d043;hpb=83828fe2683227f4d8ecb2343eff28439741b490;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 9e74eeb..a3df1a5 100755
--- a/pxe-server
+++ b/pxe-server
@@ -63,7 +63,6 @@ EOF
 
 ##### begin command line parsing ########
 
-args=()
 redep=true
 acks=2
 wait=false
@@ -80,7 +79,7 @@ while true; do
     esac
 done
 
-read host type <<<"$@"
+read -r host type <<<"$@"
 
 case $# in
     0|2);;
@@ -120,7 +119,6 @@ EOF
 
 fai() {
     cat <<EOF
-$set_host_tag
 dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
 EOF
 }
@@ -132,8 +130,7 @@ ack-wait() {
     fi
     regex=".*DHCPACK.*$host_regex$"
     i=0
-    tmp=$(mktemp)
-    while (( i != wait_count )) && read line; do
+    while (( i != wait_count )) && read -r line; do
         if [[ $line =~ $regex ]]; then
             i=$((i+1))
             echo $line
@@ -156,7 +153,9 @@ if $set; then
             e fai-redep
         fi
     else
-        e myfai-chboot
+        # This will fail if faiserver is not setup, so ignore any
+        # failure and don't bother us about it.
+        myfai-chboot &>/dev/null ||:
     fi
 fi