iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes for etiona and pxe
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index 07262fca9a70a2cf3036def43eb76fb470794b64..6ca453c56790d6ad02939e867541819f9ef760f1 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-75,7
+75,7
@@
wait=false
fsf=false
case $HOSTNAME in
fsf=false
case $HOSTNAME in
- x
2
|kw) fsf=true ;;
+ x
3
|kw) fsf=true ;;
esac
chboot_args=()
esac
chboot_args=()
@@
-132,9
+132,9
@@
fi
archlike() {
cat <<EOF
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}bootfile-name,
/${type}/boot/syslinux/lpxelinux.0
EOF
}
EOF
}
@@
-142,19
+142,26
@@
plain() {
# if arch based was used before, this additionally needs
# the tftp link in /mnt/usb to be changed.
cat <<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}bootfile-name,
pxelinux.0
EOF
}
fai() {
cat <<EOF
EOF
}
fai() {
cat <<EOF
-dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
+${host_tag}bootfile-name,pxelinux.0
+${host_tag}server-ip-address,$faiserverip
+${host_tag}tftp-server,$faiserverip
EOF
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
}
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
else
wait_cmd="ssh wrt logread -f"
fi
@@
-162,8
+169,8
@@
ack-wait() {
if [[ $host ]]; then
if $fsf; then
host_regex=" $(getent hosts kw | awk '{print $1}' | sed 's/\./\\./g')"
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"
fi
fi
regex=".*DHCPACK.*$host_regex\b"
@@
-182,13
+189,13
@@
set-pxe() {
if $fsf; then
if [[ ! $cmd ]]; then
e "removing pxe for $host on tarantula"
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"
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
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
@@
-196,11
+203,18
@@
EOF
else
e "updating dnsmasq.conf:"
m $cmd
else
e "updating dnsmasq.conf:"
m $cmd
- ${cmd:-:}|ssh wrt "
cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+ ${cmd:-:}|ssh wrt "
dd of=/etc/dnsmasq-dhcpopts.conf; /etc/init.d/dnsmasq reload
$([[ $type == arch || $type == parabola ]] && echo archlike-pxe-mount)"
fi
}
$([[ $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 $set; then
set-pxe