archlike() {
cat <<EOF
-dhcp-option-force=209,boot/syslinux/${type}iso.cfg
-dhcp-option-force=210,/${type}/
-dhcp-boot=${host_tag}/${type}/boot/syslinux/lpxelinux.0
+${host_tag}209,boot/syslinux/${type}iso.cfg
+${host_tag}210,/${type}/
+${host_tag}option:bootfile-name,/${type}/boot/syslinux/lpxelinux.0
EOF
}
# if arch based was used before, this additionally needs
# the tftp link in /mnt/usb to be changed.
cat <<EOF
-dhcp-boot=${host_tag}pxelinux.0
+${host_tag}option:bootfile-name,pxelinux.0
EOF
}
fai() {
cat <<EOF
-dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
+${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
+ # install.
+ #
+ # dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
}
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
if $fsf; then
host_regex=" $(getent hosts kw | awk '{print $1}' | sed 's/\./\\./g')"
- else
- host_regex=" $host"
+ else
+ host_regex=" $host"
fi
fi
regex=".*DHCPACK.*$host_regex\b"
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 "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+ ${cmd:-:}|ssh cmc "dd of=/etc/dnsmasq-dhcpopts.conf; /etc/init.d/dnsmasq reload
$([[ $type == arch || $type == parabola ]] && echo archlike-pxe-mount)"
fi
}
+type -t host &>/dev/null || sudo apt-get -y install dnsutils
+faiserverip=$(host faiserver | sed -rn 's/^\S+ has address //p;T;q' ||:)
+if [[ ! $faiserverip || $faiserverip =~ [[:space:]] ]]; then
+ echo "$0: error: failed to get \$faiserverip, got: $faiserverip"
+ exit 1
+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.