bunch of etiona updates

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 07262fca9a70a2cf3036def43eb76fb470794b64..e6680883201c5f11d4a096120a779e4dfb25c852 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -75,7 +75,7 @@ wait=false
 fsf=false
 
 case $HOSTNAME in
-  x2|kw) fsf=true ;;
+  x3|kw) fsf=true ;;
 esac
 
 chboot_args=()
@@ -154,7 +154,7 @@ EOF
 
 ack-wait() {
   if $fsf; then
-    wait_cmd="ssh tarantula tail -n0 -f /var/log/syslog"
+    wait_cmd="ssh tarantula.office.fsf.org tail -n0 -f /var/log/syslog"
   else
     wait_cmd="ssh wrt logread -f"
   fi
@@ -182,13 +182,13 @@ set-pxe() {
   if $fsf; then
     if [[ ! $cmd ]]; then
       e "removing pxe for $host on tarantula"
-      ssh tarantula bash -e <<EOF
+      ssh tarantula.office.fsf.org bash -e <<EOF
 sed -ri 's/^( *host +$host *\{).*/\1/' /etc/dhcp3/dhcpd.conf
 /etc/init.d/dhcp3-server restart
 EOF
     elif [[ $cmd == fai ]]; then
       e "adding pxe for $host on tarantula"
-      ssh tarantula bash -e <<EOF
+      ssh tarantula.office.fsf.org bash -e <<EOF
 sed -ri 's/^( *host +$host *\{).*/\1 next-server faiserver.office.fsf.org; filename "pxelinux.0";/' /etc/dhcp3/dhcpd.conf
 /etc/init.d/dhcp3-server restart
 EOF