4.0 support (#608)

2024-08-30 18:32:21 +00:00 · 2024-05-13 19:34:28 -07:00 · 2024-05-13 19:34:28 -07:00 · e5269cf3cf
commit e5269cf3cf
parent 549af97bfb
42 changed files with 229 additions and 334 deletions
--- a/att-ipv6/10-att-ipv6.sh
+++ b/att-ipv6/10-att-ipv6.sh
@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 set -eo pipefail

 # Get DataDir location
@ -7,10 +7,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/cloudflare-ddns/on_boot.d/30-cloudflare-ddns.sh
+++ b/cloudflare-ddns/on_boot.d/30-cloudflare-ddns.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/dns-common/on_boot.d/10-dns.sh
+++ b/dns-common/on_boot.d/10-dns.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/haproxy/50-haproxy.sh
+++ b/haproxy/50-haproxy.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -17,7 +14,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/haproxy" ]; then
  # If it does not exist, create the directory
--- a/haproxy/update-haproxy.sh
+++ b/haproxy/update-haproxy.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -16,7 +13,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 podman pull $IMAGE
 podman stop haproxy
 podman rm haproxy
--- a/hdhomerun/on_boot.d/99-hdhomerun.sh
+++ b/hdhomerun/on_boot.d/99-hdhomerun.sh
@ -8,10 +8,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/homebridge/on_boot.d/25-homebridge.sh
+++ b/homebridge/on_boot.d/25-homebridge.sh
@ -7,10 +7,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -18,7 +15,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac 
-
 ## network configuration and startup:
 CNI_PATH=${DATA_DIR}/podman/cni
 # Check if the directory exists
--- a/ipt-enable-logs/on_boot.d/30-ipt-enable-logs-launch.sh
+++ b/ipt-enable-logs/on_boot.d/30-ipt-enable-logs-launch.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -17,7 +14,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/scripts" ]; then
  # If it does not exist, create the directory
--- a/ipt-enable-logs/scripts/ipt-enable-logs.sh
+++ b/ipt-enable-logs/scripts/ipt-enable-logs.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/ipt-enable-logs/scripts/refresh-iptables.sh
+++ b/ipt-enable-logs/scripts/refresh-iptables.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/modern-unix/on_boot.d/10-shell-profile.sh
+++ b/modern-unix/on_boot.d/10-shell-profile.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bssh

 ## Configure shell profile
 PROFILE_SOURCE=/data/settings/profile/global.profile.d
--- a/modern-unix/settings/profile/global.profile.d/aliases.sh
+++ b/modern-unix/settings/profile/global.profile.d/aliases.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 alias ...=../..
 alias ....=../../..
--- a/modern-unix/settings/profile/global.profile.d/opt.sh
+++ b/modern-unix/settings/profile/global.profile.d/opt.sh
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 PATH="/data/opt:$PATH"
 export PATH
--- a/mosquitto/on_boot.d/45-mosquitto.sh
+++ b/mosquitto/on_boot.d/45-mosquitto.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -36,7 +33,7 @@ CONTAINER_CNI_PATH="${DATA_DIR}/podman/cni/45-mosquitto.conflist"
 # make sure cni plugs are installed
 if ! test -f /opt/cni/bin/macvlan; then
  echo "Error: CNI plugins not found. You can install it with the following command:" >&2
-  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/sh ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
+  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/bash ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
  exit 1
 fi

--- a/on-boot-script-2.x/Dockerfile
+++ b/on-boot-script-2.x/Dockerfile
@ -1,7 +1,7 @@
-FROM debian:stretch-slim
+FROM debian:bookworm-slim

 RUN set -ex \
-    && echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list \
+    && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \
    && apt-get update \
    && apt-get install -y --no-install-recommends \
 	build-essential \
--- a/on-boot-script-2.x/README.md
+++ b/on-boot-script-2.x/README.md
@ -22,7 +22,7 @@
 You can execute in UDM/Pro/SE and UDR with:

 ```bash
-curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script-2.x/remote_install.sh" | /bin/sh
+curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script-2.x/remote_install.sh" | /bin/bash
 ```

 This is a force to install script so will uninstall any previous version and install on_boot keeping your on boot files.
@ -37,11 +37,11 @@ This will also install CNI Plugins & CNI Bridge scripts. If you are using UDMSE/
   unifi-os shell
   ```

-2. Download [udm-boot-2x_1.0.1_all.deb](packages/udm-boot_1.0.0-2x_all.deb) and install it and go back to the UDM.
+2. Download [udm-boot-2x_1.0.1_all.deb](packages/udm-boot-2x_1.0.1_all.deb) and install it and go back to the UDM.

   ```bash
-   curl -L [[https://udm-boot.boostchicken.dev](https://unifi.boostchicken.io/udm-boot-2x_1.0.0_all.deb)](https://unifi.boostchicken.io/udm-boot-2x_1.0.0_all.deb) -o udm-boot-2x_1.0.0_all.deb
-   dpkg -i udm-boot-2x_1.0.0_all.deb
+   curl -L [[https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb](https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb)](https://unifi.boostchicken.io/udm-boot-v2+/udm-boot-2x_1.0.1_all.deb) -o udm-boot-2x_1.0.1_all.deb
+   dpkg -i udm-boot-2x_1.0.1_all.deb
   systemctl enable udm-boot
   exit
   ```
--- a/on-boot-script-2.x/dpkg-build-files/debian/prerm
+++ b/on-boot-script-2.x/dpkg-build-files/debian/prerm
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # prerm script for udm-boot
 #
 # see: dh_installdeb(1)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/10-shell-profile.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/10-shell-profile.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-github-ssh-keys.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-github-ssh-keys.sh
@ -1,15 +1,11 @@
 #!/bin/bash

 # Get DataDir location
-DATA_DIR="/data"
-case "$(ubnt-device-info firmware || true)" in
+DATA_DIR="/data"case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-	DATA_DIR="/data"
-	;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-root-ssh-keys.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-root-ssh-keys.sh
@ -1,14 +1,10 @@
 #!/bin/bash
 # Get DataDir location
-DATA_DIR="/data"
-case "$(ubnt-device-info firmware || true)" in
+DATA_DIR="/data"case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-	DATA_DIR="/data"
-	;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-ssh-known-hosts.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/15-add-ssh-known-hosts.sh
@ -1,14 +1,10 @@
 #!/bin/bash
 # Get DataDir location
-DATA_DIR="/data"
-case "$(ubnt-device-info firmware || true)" in
+DATA_DIR="/data"case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-	DATA_DIR="/data"
-	;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/15-preserve-history.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/15-preserve-history.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/examples/udm-files/on_boot.d/25-add-cron-jobs.sh
+++ b/on-boot-script-2.x/examples/udm-files/on_boot.d/25-add-cron-jobs.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script-2.x/remote_install.sh
+++ b/on-boot-script-2.x/remote_install.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -17,7 +14,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # A change in the name udm-boot would need to be reflected as well in systemctl calls.
 SYSTEMCTL_PATH="/etc/systemd/system/udm-boot.service"
 SYMLINK_SYSTEMCTL="/etc/systemd/system/multi-user.target.wants/udm-boot.service"
--- a/on-boot-script/README.md
+++ b/on-boot-script/README.md
@ -34,7 +34,7 @@
 You can execute in UDM/Pro/SE and UDR with:

 ```bash
-curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script/remote_install.sh" | /bin/sh
+curl -fsL "https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/HEAD/on-boot-script/remote_install.sh" | /bin/bash
 ```

 This is a force to install script so will uninstall any previous version and install on_boot keeping your on boot files.
--- a/on-boot-script/dpkg-build-files/debian/postinst
+++ b/on-boot-script/dpkg-build-files/debian/postinst
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postinst script for udm-boot
 #
 # see: dh_installdeb(1)
--- a/on-boot-script/examples/udm-files/on_boot.d/15-preserve-history.sh
+++ b/on-boot-script/examples/udm-files/on_boot.d/15-preserve-history.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/on-boot-script/remote_install.sh
+++ b/on-boot-script/remote_install.sh
@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash

 # Get DataDir location
 DATA_DIR="/data"
@ -6,13 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
-  DATA_DIR="/data"
-  ;;
-4*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -20,7 +14,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac 
-
 # A change in the name udm-boot would need to be reflected as well in systemctl calls.
 SYSTEMCTL_PATH="/etc/systemd/system/udm-boot.service"
 SYMLINK_SYSTEMCTL="/etc/systemd/system/multi-user.target.wants/udm-boot.service"
--- a/persist-changes/on_boot.d/42-watch-for-changes.sh
+++ b/persist-changes/on_boot.d/42-watch-for-changes.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/podman-install/on_boot.d/00-podman.sh
+++ b/podman-install/on_boot.d/00-podman.sh
@ -47,10 +47,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/podman-update/01-podman-update.sh
+++ b/podman-update/01-podman-update.sh
@ -1,14 +1,10 @@
 #!/bin/bash
 # Get DataDir location
-DATA_DIR="/data"
 case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/rclone/10-rclone.sh
+++ b/rclone/10-rclone.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/rclone/README.md
+++ b/rclone/README.md
@ -29,5 +29,5 @@
 1. Login to run rclone commands locally to create and test configs

   ```sh
-   podman exec -ti rclone /bin/sh
+   podman exec -ti rclone /
   ```
--- a/run-pihole/DoTE.Dockerfile
+++ b/run-pihole/DoTE.Dockerfile
@ -6,5 +6,5 @@ RUN curl -fsSLo /opt/dote https://github.com/chrisstaite/DoTe/releases/latest/do
  chmod +x /opt/dote && \
  usermod -aG pihole www-data; \
  mkdir -p /etc/cont-init.d && \
-  echo -e "#!/bin/sh\nchmod +x /opt/dote\n/opt/dote \$DOTE_OPTS -d\n" > /etc/cont-init.d/10-dote.sh && \
+  echo -e "#!/bin/bash\nchmod +x /opt/dote\n/opt/dote \$DOTE_OPTS -d\n" > /etc/cont-init.d/10-dote.sh && \
  chmod +x /etc/cont-init.d/10-dote.sh
--- a/run-pihole/upd_pihole.sh
+++ b/run-pihole/upd_pihole.sh
@ -7,10 +7,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/suricata/on_boot.d/25-suricata.sh
+++ b/suricata/on_boot.d/25-suricata.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -16,7 +13,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/suricata-rules" ]; then
  # If it does not exist, create the directory
--- a/tailscale/on_boot.d/20-tailscale.sh
+++ b/tailscale/on_boot.d/20-tailscale.sh
@ -15,7 +15,7 @@ start() {
      tailscale/tailscale \
      tailscaled --state=mem:
      # Changing sysctls inside the container to support running an exit node
-    cat <<'INIT' | podman exec --privileged ${CONTAINER} /bin/sh
+    cat <<'INIT' | podman exec --privileged ${CONTAINER} /bin/bash
 echo '1' > /proc/sys/net/ipv4/ip_forward ;
 echo '1' > /proc/sys/net/ipv6/conf/all/forwarding ;
 INIT
--- a/unbound/on_boot.d/11-unbound-macvlanip.sh
+++ b/unbound/on_boot.d/11-unbound-macvlanip.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -16,7 +13,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/unbound" ]; then
  # If it does not exist, create the directory
@ -60,7 +56,7 @@ CONTAINER=unbound

 if ! test -f /opt/cni/bin/macvlan; then
  echo "Error: CNI plugins not found. You can install it with the following command:" >&2
-  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/sh ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
+  echo "       curl -fsSLo ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh https://raw.githubusercontent.com/unifi-utilities/unifios-utilities/main/cni-plugins/05-install-cni-plugins.sh && /bin/bash ${DATA_DIR}/on_boot.d/05-install-cni-plugins.sh" >&2
  exit 1
 fi

--- a/unbound/scripts/init_unbound.sh
+++ b/unbound/scripts/init_unbound.sh
@ -5,10 +5,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-    DATA_DIR="/data"
-    ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -16,7 +13,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # init unbound container - quick and dirty for now
 # no checks, no balances

--- a/unbound/scripts/upd_unbound.sh
+++ b/unbound/scripts/upd_unbound.sh
@ -11,6 +11,9 @@ case "$(ubnt-device-info firmware || true)" in
 3*)
    DATA_DIR="/data"
    ;;
+4*)
+    DATA_DIR="/data"
+    ;;
 *)
    echo "ERROR: No persistent storage found." 1>&2
    exit 1
--- a/wireguard-go/on_boot.d/20-wireguard.sh
+++ b/wireguard-go/on_boot.d/20-wireguard.sh
@ -6,10 +6,7 @@ case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
--- a/zerotier-one/20-zerotier.sh
+++ b/zerotier-one/20-zerotier.sh
@ -1,14 +1,10 @@
 #!/bin/bash
 # Get DataDir location
-DATA_DIR="/data"
-case "$(ubnt-device-info firmware || true)" in
+DATA_DIR="/data"case "$(ubnt-device-info firmware || true)" in
 1*)
    DATA_DIR="/mnt/data"
    ;;
-2*)
-  DATA_DIR="/data"
-  ;;
-3*)
+2* | 3* | 4*)
    DATA_DIR="/data"
    ;;
 *)
@ -16,7 +12,6 @@ case "$(ubnt-device-info firmware || true)" in
    exit 1
    ;;
 esac
-
 # Check if the directory exists
 if [ ! -d "${DATA_DIR}/zerotier-one" ]; then
  # If it does not exist, create the directory