misc new stuff

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 6ca453c56790d6ad02939e867541819f9ef760f1..692ffbbc62f34eec05fe5be2ccb8541030146be1 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -16,6 +16,7 @@
 # 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"
 
@@ -56,6 +57,21 @@ rm tftpboot
 ln -s <arch/parabola/debian iso dir> tftpboot
 
 
+Notes on debugging pxe dhcp tftp:
+
+For debugging dhcp, add to /etc/dnsmasq.conf: log-dhcp
+
+Newer openwrt runs dnsmasq with a whitelist of readable files and dirs:
+
+ps ww :
+/sbin/ujail -t 5 -n dnsmasq -u -l -r /bin/ubus -r /etc/TZ -r /etc/dnsmasq.conf -r /etc/ethers -r /etc/group -r /etc/hosts -r /etc/passwd -w /tmp/dhcp.leases -r /tmp/dnsmasq.d -r /tmp/hosts -r /tmp/resolv.conf.d -r /usr/bin/jshn -r /usr/lib/dnsmasq/dhcp-script.sh -r /usr/share/dnsmasq/dhcpbogushostname.conf -r /usr/share/dnsmasq/rfc6761.conf -r /usr/share/dnsmasq/trust-anchors.conf -r /usr/share/libubox/jshn.sh -r /var/etc/dnsmasq.conf.cfg01411c -w /var/run/dnsmasq/ -- /usr/sbin/dnsmasq -C /var/etc/dnsmasq.conf.cfg01411c -k -x /var/run/dnsmasq/dnsmasq.cfg01411c.pid
+
+logging tftp requests:
+/etc/default/tftpd-hpa:
+add -vv:
+TFTP_OPTIONS="--secure -vv"
+jr -u tftpd-hpa -f
+
 Note: Uses GNU getopt options parsing style
 EOF
   exit $1
@@ -66,6 +82,8 @@ m() { printf "$pre %s\n"  "$*"; "$@"; }
 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
@@ -134,7 +152,7 @@ archlike() {
   cat <<EOF
 ${host_tag}209,boot/syslinux/${type}iso.cfg
 ${host_tag}210,/${type}/
-${host_tag}bootfile-name,/${type}/boot/syslinux/lpxelinux.0
+${host_tag}option:bootfile-name,/${type}/boot/syslinux/lpxelinux.0
 EOF
 }
 
@@ -142,15 +160,15 @@ plain() {
   # if arch based was used before, this additionally needs
   # the tftp link in /mnt/usb to be changed.
   cat <<EOF
-${host_tag}bootfile-name,pxelinux.0
+${host_tag}option:bootfile-name,pxelinux.0
 EOF
 }
 
 fai() {
   cat <<EOF
-${host_tag}bootfile-name,pxelinux.0
-${host_tag}server-ip-address,$faiserverip
-${host_tag}tftp-server,$faiserverip
+${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
@@ -163,7 +181,7 @@ 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
@@ -190,20 +208,20 @@ 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
     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=/var/run/dnsmasq/dhcpopts.conf; /etc/init.d/dnsmasq reload
 $([[ $type == arch || $type == parabola ]] && echo archlike-pxe-mount)"
   fi
 }
@@ -219,10 +237,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.