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
bug fix
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index d40751e811ffb90601854d14eda312bc92694bfb..37dbb7957c5ee572336359dd1755003318c4fe22 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-163,7
+163,7
@@
ack-wait() {
if $fsf; then
wait_cmd="ssh tarantula.office.fsf.org tail -n0 -f /var/log/syslog"
else
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
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
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/dhcp
3
/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
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/dhcp
3
/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
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
}
$([[ $type == arch || $type == parabola ]] && echo archlike-pxe-mount)"
fi
}
@@
-219,10
+219,10
@@
fi
if $set; then
set-pxe
if [[ $type == fai ]]; then
if $set; then
set-pxe
if [[ $type == fai ]]; then
- m myfai-chboot ${chboot_args[@]} $host
if $redep; then
m fai-redep
fi
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.
else
# This will fail if faiserver is not setup, so ignore any
# failure and don't bother us about it.