X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=66bc4ff4129da671c713082138ae091c40834e81;hb=1a9e69876006d789df6fb5597419ef38f864903e;hp=d8cbeb819b03bc134245ba0ec484f03577cf3114;hpb=ec9227898fa68bd89de454c87bce8ea051a8d783;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index d8cbeb8..66bc4ff 100755
--- a/pxe-server
+++ b/pxe-server
@@ -28,11 +28,11 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF
-Usage: ${0##*/} [OPTIONS] TYPE [HOST]
+Usage: ${0##*/} [OPTIONS] [HOST TYPE]
 One line description
 
-TYPE is one of arch, plain, fai, or : for no pxe server.
-HOST makes the pxe server only for that specific host
+TYPE is one of arch, plain, fai.
+HOST is a hostname known to the dhcp server, or default for all, or none to disable
 
 -r         Don't redeploy fai config.
 -a         Wait for 2 dhcp acks, then disable the pxe server after a delay.
@@ -68,12 +68,16 @@ while true; do
     esac
 done
 
-read type host <<<"$@"
+read host type <<<"$@"
 
-if [[ ! $type ]]; then
-    echo "$0: error: exptected 1 argument of type"
-    usage 1
-fi
+case $# in
+    0|2);;
+    *)
+        echo "$0: error: expected 0 or 2 arguments"
+        echo
+        usage 1
+        ;;
+esac
 
 if [[ $host ]]; then
     host_tag="tag:$host,"
@@ -127,19 +131,20 @@ ack-wait() {
 }
 
 set-pxe() {
-    ${1:-$type} | ssh wrt "cedit pxe-server /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
-if [[ $type == arch ]]; then arch-pxe-mount; fi"
+    ${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+$([[ $type == arch ]] && echo arch-pxe-mount)"
 }
 
 
 if $set; then
     set-pxe
-
     if [[ $type == fai ]]; then
+        myfai-chboot $host
         if $redep; then
             fai-redep
         fi
-        faiserver-enable
+    else
+        myfai-chboot
     fi
 fi
 
@@ -150,7 +155,8 @@ if $wait; then
     # bleh.
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
-    set-pxe :
+    type=
+    set-pxe
 
     # previously tried waiting for one more ack then disabling faiserver,
     # since it can contain sensitive info, so turn it off when not in use,