dnsmasq: rework jail mounts

Daniel Golle daniel at makrotopia.org
Sun Aug 1 07:07:51 PDT 2021


On Sun, Aug 01, 2021 at 03:58:45PM +0200, e9hack wrote:
> Hi,
> 
> in last update of jail mounts, this part looks wrong:
> 
> --- a/package/network/services/dnsmasq/files/dnsmasq.init
> +++ b/package/network/services/dnsmasq/files/dnsmasq.init
> @@ -10,6 +10,7 @@ ADD_LOCAL_DOMAIN=1
>  ADD_LOCAL_HOSTNAME=1
>  ADD_WAN_FQDN=0
>  ADD_LOCAL_FQDN=""
> +EXTRA_MOUNT=""
> 
>  BASECONFIGFILE="/var/etc/dnsmasq.conf"
>  BASEHOSTFILE="/tmp/hosts/dhcp"
> 
> It shall be:
> 
> --- a/package/network/services/dnsmasq/files/dnsmasq.init
> +++ b/package/network/services/dnsmasq/files/dnsmasq.init
> @@ -818,9 +817,10 @@ dnsmasq_start()
>         config_get_bool disabled "$cfg" disabled 0
>         [ "$disabled" -gt 0 ] && return 0
> 
> -       # reset list of DOMAINS and DNS servers (for each dnsmasq instance)
> +       # reset list of DOMAINS, DNS servers and EXTRA mounts (for each dnsmasq instance)
>         DNS_SERVERS=""
>         DOMAIN=""
> +       EXTRA_MOUNT=""
>         CONFIGFILE="${BASECONFIGFILE}.${cfg}"
>         CONFIGFILE_TMP="${CONFIGFILE}.$$"
>         HOSTFILE="${BASEHOSTFILE}.${cfg}"

Applied your fix, thank you!



More information about the openwrt-devel mailing list