iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update webserver setup dependency
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index 9e74eeb757a030c9a367fabb3c8440597188d043..a3df1a5953846368397e9b335be844970b132771 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-63,7
+63,6
@@
EOF
##### begin command line parsing ########
##### begin command line parsing ########
-args=()
redep=true
acks=2
wait=false
redep=true
acks=2
wait=false
@@
-80,7
+79,7
@@
while true; do
esac
done
esac
done
-read host type <<<"$@"
+read
-r
host type <<<"$@"
case $# in
0|2);;
case $# in
0|2);;
@@
-120,7
+119,6
@@
EOF
fai() {
cat <<EOF
fai() {
cat <<EOF
-$set_host_tag
dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
EOF
}
dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
EOF
}
@@
-132,8
+130,7
@@
ack-wait() {
fi
regex=".*DHCPACK.*$host_regex$"
i=0
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
if [[ $line =~ $regex ]]; then
i=$((i+1))
echo $line
@@
-156,7
+153,9
@@
if $set; then
e fai-redep
fi
else
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
fi
fi