From aec049c1fa0ea19dddc9b80a97d027118f81b8e7 Mon Sep 17 00:00:00 2001 From: Tim Wilkinson Date: Tue, 12 Dec 2023 20:01:51 -0800 Subject: [PATCH] Add dnsmasq user include file to support persistent user options (#1007) --- files/etc/aredn_include/dnsmasq-user.conf | 1 + files/etc/arednsysupgrade.conf | 1 + files/etc/dnsmasq.conf | 3 +++ 3 files changed, 5 insertions(+) create mode 100755 files/etc/aredn_include/dnsmasq-user.conf diff --git a/files/etc/aredn_include/dnsmasq-user.conf b/files/etc/aredn_include/dnsmasq-user.conf new file mode 100755 index 00000000..1a1c268c --- /dev/null +++ b/files/etc/aredn_include/dnsmasq-user.conf @@ -0,0 +1 @@ +# Extra user dnsmasq options (preserved across reboots and upgrades) diff --git a/files/etc/arednsysupgrade.conf b/files/etc/arednsysupgrade.conf index 037ea9d3..633ed8e3 100644 --- a/files/etc/arednsysupgrade.conf +++ b/files/etc/arednsysupgrade.conf @@ -23,6 +23,7 @@ /etc/aredn_include/lan.network.user /etc/aredn_include/wan.network.user /etc/aredn_include/dtdlink.network.user +/etc/aredn_include/dnsmasq-user.conf /etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_ecdsa_host_key diff --git a/files/etc/dnsmasq.conf b/files/etc/dnsmasq.conf index 1262a371..930ccee1 100644 --- a/files/etc/dnsmasq.conf +++ b/files/etc/dnsmasq.conf @@ -29,3 +29,6 @@ dhcp-option=option:domain-search,local.mesh strict-order log-facility=/dev/null + +# extra user options +conf-file=/etc/aredn_include/dnsmasq-user.conf