diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-20 16:53:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-20 16:58:14 +0000 |
| commit | 563c1afc36c50cd62c143587fd3adeccd2fef014 (patch) | |
| tree | 1dcbf89a0dca2959ad7d5b6b7f5f53e6b71efe3f /main/dnsmasq/dnsmasq.initd | |
| parent | 65bc9c288605bc9446348bd22d841599dc50fa26 (diff) | |
| download | aports-563c1afc36c50cd62c143587fd3adeccd2fef014.tar.bz2 aports-563c1afc36c50cd62c143587fd3adeccd2fef014.tar.xz | |
main/dnsmasq: add DNSMASQ_LISTEN_BRIDGE_ADDR option
some setups with tinc may have two different adresses with same(!) ip
addr. This confuses dnsmasq if --listen-address is specified. We make it
possible to work around it by making it possible to disable
--listen-address via DNSMASQ_LISTEN_BRIGE_ADDR=no.
Diffstat (limited to 'main/dnsmasq/dnsmasq.initd')
| -rw-r--r-- | main/dnsmasq/dnsmasq.initd | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd index a16c206a8f..4fc45136b8 100644 --- a/main/dnsmasq/dnsmasq.initd +++ b/main/dnsmasq/dnsmasq.initd @@ -25,6 +25,7 @@ if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ]; then : ${BRIDGE_DHCP_RANGE:="10.0.3.2,10.0.3.254"} : ${BRIDGE_DHCP_MAX:="253"} : ${BRIDGE_MAC:="00:16:3e:00:00:00" } + : ${DNSMASQ_LISTEN_BRIDGE_ADDR:=yes} fi . @@ -86,7 +87,10 @@ start_pre() { if [ -z "$DISABLE_IPTABLES" ]; then setup_firewall -I -A fi - command_args="$command_args --strict-order --bind-interfaces --listen-address ${BRIDGE_ADDR} --except-interface=lo --interface=$BRIDGE --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative" + if yesno "$DNSMASQ_LISTEN_BRIDGE_ADDR"; then + command_args="$command_args --listen-address ${BRIDGE_ADDR}" + fi + command_args="$command_args --strict-order --bind-interfaces --except-interface=lo --interface=$BRIDGE --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative" } stop_post() { |