Merge pull request #688 from michaelw/mw/att-ipv6-unifios5

fix: update dhcpcd installation for ATT IPv6 for UnifiOS 5.x

Author: bslatyer

att-ipv6/10-att-ipv6.sh

@@ -30,12 +30,9 @@ vlans="br0"                                          # "br0 br100 br101..."
 domain="example.invalid"                             # DNS domain
 dns6="[2001:4860:4860::8888],[2001:4860:4860::8844]" # Google
 
-CONTAINER=att-ipv6
 confdir=${DATA_DIR}/att-ipv6
 
 # main
-mkdir -p "${confdir}/dhcpcd"
-
 test -f "${confdir}/dhcpcd.conf" || {
   : >"${confdir}/dhcpcd.conf.tmp"
   cat >>"${confdir}/dhcpcd.conf.tmp" <<EOF
@@ -90,12 +87,32 @@ EOF
   mv "${confdir}/att-ipv6-dnsmasq.conf.tmp" "${confdir}/att-ipv6-dnsmasq.conf"
 }
 
-if podman container exists "$CONTAINER"; then
-  podman start "$CONTAINER"
-else
-  podman run -d --restart=always --name "$CONTAINER" -v "${confdir}/dhcpcd.conf:/etc/dhcpcd.conf" -v "${confdir}/dhcpcd:/var/lib/dhcpcd" --net=host --privileged ghcr.io/michaelw/dhcpcd
+if ! dpkg -s dhcpcd5 >/dev/null 2>&1; then
+  apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get install -y dhcpcd5
+fi
+
+restart_dhcpcd=0
+if [ ! -f /etc/dhcpcd.conf ] || ! cmp -s "${confdir}/dhcpcd.conf" /etc/dhcpcd.conf; then
+  cp "${confdir}/dhcpcd.conf" /etc/dhcpcd.conf
+  restart_dhcpcd=1
+fi
+
+if [ "$restart_dhcpcd" -eq 1 ]; then
+  start-stop-daemon -K -x /usr/sbin/dhcpcd
+fi
+
+# Warn if UniFi's DHCPv6 client is still active; this setup expects it disabled in UI.
+if pgrep -x odhcp6c >/dev/null 2>&1; then
+  echo "WARNING: odhcp6c is running. Disable WAN/network DHCPv6 in the UniFi UI to avoid conflicts with att-ipv6." >&2
 fi
 
-# Fix DHCP, assumes DHCPv6 is turned off in UI
-cp "${confdir}/att-ipv6-dnsmasq.conf" /run/dnsmasq.conf.d/
+# Fix DHCP
+if [ -d /run/dnsmasq.dhcp.conf.d ]; then
+  # UniFi Network > 9.3.29 (commonly on UniFi OS 5.x)
+  cp "${confdir}/att-ipv6-dnsmasq.conf" /run/dnsmasq.dhcp.conf.d/att-ipv6.conf
+else
+  # older versions
+  cp "${confdir}/att-ipv6-dnsmasq.conf" /run/dnsmasq.conf.d/att-ipv6.conf
+fi
 start-stop-daemon -K -q -x /usr/sbin/dnsmasq

att-ipv6/README.md

@@ -33,6 +33,8 @@ Near the top of `10-att-ipv6.sh`:
 
 This generates configuration files in directory `/data/att-ipv6`, if they don't exist.
 The files can be edited, or regenerated by deleting them and re-running the script.
+The script installs `dhcpcd5` via `apt` (if needed), copies `/data/att-ipv6/dhcpcd.conf` to `/etc/dhcpcd.conf`, and restarts `dhcpcd` when that configuration changes.
+For dnsmasq, it writes `att-ipv6.conf` to `/run/dnsmasq.dhcp.conf.d/` on newer UniFi Network releases (post-`9.3.29`), and falls back to `/run/dnsmasq.conf.d/` on older versions.
 
 ## Installation
 
@@ -43,11 +45,9 @@ The files can be edited, or regenerated by deleting them and re-running the scri
     ./10-att-ipv6.sh
     ```
 
-The dhcpcd container being used is built [here](https://github.com/michaelw/dhcpcd-container/pkgs/container/dhcpcd)
-
 ## Validation
 
-Running the script starts dhcpcd within the `att-ipv6` container on `eth8` (WAN1) and only for the default network (`br0`). This can be customized, see above.
+Running the script configures and runs `dhcpcd` directly on the host for `eth8` (WAN1) and only for the default network (`br0`). This can be customized, see above.
 
 To check that everything is working as expected, and the ATT RG delegates multiple prefixes:
 
@@ -65,7 +65,7 @@ $ ip -6 r               # should see a default route on the WAN interface, and a
 ```
 
 ```sh
-$ podman logs att-ipv6  # should see dhcpcd successfully acquiring prefixes
+$ journalctl -u dhcpcd -n 200 --no-pager  # should see dhcpcd successfully acquiring prefixes
 [...]
 eth9: writing lease `/var/lib/dhcpcd/eth9.lease6'
 eth9: delegated prefix 2600:1700:X:yyyf::/64
@@ -110,21 +110,15 @@ On BGW320-500, check https://192.168.1.254/cgi-bin/lanstatistics.ha for multiple
 On clients:
 
 ```
-ip -6 addr show # should see SLAAC and/or DHCPv6 addresses received (if not, check dnsmasq configuration in `/run/dnsmasq.conf.d`)
+ip -6 addr show # should see SLAAC and/or DHCPv6 addresses received (if not, check dnsmasq configuration in `/run/dnsmasq.dhcp.conf.d/att-ipv6.conf` or `/run/dnsmasq.conf.d/att-ipv6.conf`)
 ```
 
 ### Useful commands
 
 ```sh
-# View dhcpcd logs to verify the container is running without error (ipv6 logs from dhcpcd are normal).
-podman logs att-ipv6
+# View dhcpcd logs to verify dhcpcd is running without error (ipv6 logs from dhcpcd are normal).
+journalctl -u dhcpcd -n 200 --no-pager
 
 # Restart dhcpcd (e.g., after configuration change)
-podman exec -it dhcpcd -x
-
-# Stop the container
-podman stop att-ipv6
-
-# Remove the container
-podman rm att-ipv6
+systemctl restart dhcpcd
 ```