From 0179ba7851631416c6f095a9bdd22377d68a0455 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 15 Apr 2022 15:30:01 +0100 Subject: dnsmasq: fix jail_mount for serversfile Fix 'serversfile' option not being jail_mounted by the init script. Signed-off-by: Bruno Victal (cherry picked from commit 0276fab64933dc42bad865974dc224e2672f99fe) Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/files/dnsmasq.init | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'package') 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" -- cgit v1.2.3