X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=37dbb7957c5ee572336359dd1755003318c4fe22;hb=9fefba0a7ad0f7d9cac32b81f960ae8828de2a66;hp=6ca453c56790d6ad02939e867541819f9ef760f1;hpb=3f20eea52b8d7f665b2c3b483921f15a0e48d7ee;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 6ca453c..37dbb79 100755
--- a/pxe-server
+++ b/pxe-server
@@ -134,7 +134,7 @@ archlike() {
   cat <<EOF
 ${host_tag}209,boot/syslinux/${type}iso.cfg
 ${host_tag}210,/${type}/
-${host_tag}bootfile-name,/${type}/boot/syslinux/lpxelinux.0
+${host_tag}option:bootfile-name,/${type}/boot/syslinux/lpxelinux.0
 EOF
 }
 
@@ -142,15 +142,15 @@ plain() {
   # if arch based was used before, this additionally needs
   # the tftp link in /mnt/usb to be changed.
   cat <<EOF
-${host_tag}bootfile-name,pxelinux.0
+${host_tag}option:bootfile-name,pxelinux.0
 EOF
 }
 
 fai() {
   cat <<EOF
-${host_tag}bootfile-name,pxelinux.0
-${host_tag}server-ip-address,$faiserverip
-${host_tag}tftp-server,$faiserverip
+${host_tag}option:bootfile-name,pxelinux.0
+${host_tag}option:server-ip-address,$faiserverip
+${host_tag}option:tftp-server,$faiserverip
 EOF
   # Note, previously used normal dnsmasq option, but it requires dnsmasq
   # restart, which causes momentary dns failures, which can bork an
@@ -163,7 +163,7 @@ ack-wait() {
   if $fsf; then
     wait_cmd="ssh tarantula.office.fsf.org tail -n0 -f /var/log/syslog"
   else
-    wait_cmd="ssh wrt logread -f"
+    wait_cmd="ssh cmc logread -f"
   fi
   wait_count=$1
   if [[ $host ]]; then
@@ -190,20 +190,20 @@ set-pxe() {
     if [[ ! $cmd ]]; then
       e "removing pxe for $host on tarantula"
       ssh tarantula.office.fsf.org bash -e <<EOF
-sed -ri 's/^( *host +$host *\{).*/\1/' /etc/dhcp3/dhcpd.conf
-/etc/init.d/dhcp3-server restart
+sed -ri 's/^( *host +$host *\{).*/\1/' /etc/dhcp/dhcpd.conf
+systemctl restart isc-dhcp-server
 EOF
     elif [[ $cmd == fai ]]; then
       e "adding pxe for $host on tarantula"
       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
+sed -ri 's/^( *host +$host *\{).*/\1 next-server faiserver.office.fsf.org; filename "pxelinux.0";/' /etc/dhcp/dhcpd.conf
+systemctl restart isc-dhcp-server
 EOF
     fi
   else
     e "updating dnsmasq.conf:"
     m $cmd
-    ${cmd:-:}|ssh wrt "dd of=/etc/dnsmasq-dhcpopts.conf; /etc/init.d/dnsmasq reload
+    ${cmd:-:}|ssh cmc "dd of=/etc/dnsmasq-dhcpopts.conf; /etc/init.d/dnsmasq reload
 $([[ $type == arch || $type == parabola ]] && echo archlike-pxe-mount)"
   fi
 }
@@ -219,10 +219,10 @@ fi
 if $set; then
   set-pxe
   if [[ $type == fai ]]; then
-    m myfai-chboot ${chboot_args[@]} $host
     if $redep; then
       m fai-redep
     fi
+    m myfai-chboot ${chboot_args[@]} $host
   else
     # This will fail if faiserver is not setup, so ignore any
     # failure and don't bother us about it.