From 9553b1b421623b7c51b0b0ad1fe860efc017745c Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 4 Apr 2022 02:20:25 -0400 Subject: [PATCH] fix pxe --- pxe-server | 17 ++++++++++++++++- wrt-setup-local | 11 ++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pxe-server b/pxe-server index 7405f58..692ffbb 100755 --- a/pxe-server +++ b/pxe-server @@ -57,6 +57,21 @@ rm tftpboot ln -s 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 @@ -206,7 +221,7 @@ EOF else e "updating dnsmasq.conf:" m $cmd - ${cmd:-:}|ssh cmc "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 } diff --git a/wrt-setup-local b/wrt-setup-local index c430800..5095678 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -1103,6 +1103,7 @@ dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow dhcp-host=70:a6:cc:3a:bb:b4,set:bow,$l.29,bow dhcp-host=6c:56:97:88:7b:74,set:amazontab,$l.31,amazontab dhcp-host=0a:8a:9b:cf:b5:ec,set:samsungtab,$l.32,samsungtab +dhcp-host=b8:27:eb:78:21:1d,set:pi3b,$l.33,pi3b @@ -1117,12 +1118,16 @@ dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,$l.251,switch9429ca # template # dhcp-host=,$l., -# uncomment to do tftpboot. openwrt snapshot from 2022-01, seems like it cant -# access /mnt/usb/tftpboot due to some jail or sandbox thing +# pxe tftpboot for arch-like. todo: openwrt snapshot from 2022-01, it cant +# access /mnt/usb/tftpboot due to ujail sandbox #enable-tftp=br-lan #tftp-root=/mnt/usb/tftpboot -#dhcp-optsfile=/etc/dnsmasq-dhcpopts.conf +#tftp-root=/var/run/dnsmasq/tftpboot + +dhcp-optsfile=/var/run/dnsmasq/dhcpopts.conf + +# for debugging dhcp #log-queries=extra EOF -- 2.30.2