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 bullseye and new ssh key changes
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index 3623cc848230b1d25ae87618db4d7403797659bc..7405f58f3b6a2c3185f8661509a48f95da29d3f1 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-16,6
+16,7
@@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
@@
-66,6
+67,8
@@
m() { printf "$pre %s\n" "$*"; "$@"; }
e() { printf "$pre %s\n" "$*"; }
err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
e() { printf "$pre %s\n" "$*"; }
err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
+PATH="/a/exe:$PATH"
+
##### begin command line parsing ########
dhcp=true
##### begin command line parsing ########
dhcp=true
@@
-190,14
+193,14
@@
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
EOF
fi
else
@@
-219,10
+222,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.