bug fix

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 3623cc848230b1d25ae87618db4d7403797659bc..37dbb7957c5ee572336359dd1755003318c4fe22 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -190,14 +190,14 @@ 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
@@ -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.