aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Victal <brunovictal@outlook.com>2022-04-15 15:30:01 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-08-10 15:06:30 +0200
commit0179ba7851631416c6f095a9bdd22377d68a0455 (patch)
tree3fdf793fb2dd55a8cb6a992d0e00fd43bb02d5e9
parentca58b8b4feb7a56e262be7260032a06032264a48 (diff)
downloadupstream-0179ba7851631416c6f095a9bdd22377d68a0455.tar.gz
upstream-0179ba7851631416c6f095a9bdd22377d68a0455.tar.bz2
upstream-0179ba7851631416c6f095a9bdd22377d68a0455.zip
dnsmasq: fix jail_mount for serversfile
Fix 'serversfile' option not being jail_mounted by the init script. Signed-off-by: Bruno Victal <brunovictal@outlook.com> (cherry picked from commit 0276fab64933dc42bad865974dc224e2672f99fe) Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rwxr-xr-xpackage/network/services/dnsmasq/files/dnsmasq.init9
1 files changed, 8 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 040ceaea2f..c4ca3eb2db 100755
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -972,7 +972,14 @@ dnsmasq_start()
config_list_foreach "$cfg" "addnhosts" append_addnhosts
config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
- append_parm "$cfg" "serversfile" "--servers-file"
+
+ local serversfile
+ config_get serversfile "$cfg" "serversfile"
+ [ -n "$serversfile" ] && {
+ xappend "--servers-file=$serversfile"
+ append EXTRA_MOUNT "$serversfile"
+ }
+
append_parm "$cfg" "tftp_root" "--tftp-root"
append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
append_parm "$cfg" "local_ttl" "--local-ttl"