diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2017-06-19 22:05:21 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2017-06-19 22:07:44 +0200 |
| commit | 8f254e9c27632322ca8b0259abf7524bdb9ae841 (patch) | |
| tree | e0f9c27c61df287b0b094bb51576025772788d20 | |
| parent | c16326cfedf7d6fb46804b0a99a7fbe21251dec0 (diff) | |
| download | upstream-8f254e9c27632322ca8b0259abf7524bdb9ae841.tar.gz upstream-8f254e9c27632322ca8b0259abf7524bdb9ae841.tar.bz2 upstream-8f254e9c27632322ca8b0259abf7524bdb9ae841.zip | |
Revert "dnsmasq: don't point --resolv-file to default location unconditionally"
This reverts commit 78edfff5303533dc52a1ac64ad745acc0a8a743e.
This breaks local dns resolving in case noresolv=1 as resolv.conf is not
populated anymore with 127.0.0.1 as resolvfile does not equal
/tmp/resolv.conf.auto anymore.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 5b4de32181..a762cd3309 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -533,7 +533,7 @@ dhcp_relay_add() { dnsmasq_start() { - local cfg="$1" disabled resolvfile + local cfg="$1" disabled config_get_bool disabled "$cfg" disabled 0 [ "$disabled" -gt 0 ] && return 0 @@ -613,6 +613,7 @@ 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" "resolvfile" "--resolv-file" "/tmp/resolv.conf.auto" append_parm "$cfg" "serversfile" "--servers-file" append_parm "$cfg" "tftp_root" "--tftp-root" append_parm "$cfg" "dhcp_boot" "--dhcp-boot" @@ -627,6 +628,7 @@ dnsmasq_start() config_get_bool readethers "$cfg" readethers [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers + config_get resolvfile $cfg resolvfile config_get dhcpscript $cfg dhcpscript config_get leasefile $cfg leasefile "/tmp/dhcp.leases" @@ -640,8 +642,6 @@ dnsmasq_start() [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile" fi - [ -n "$resolvfile" ] && xappend "--resolv-file=$resolvfile" - config_get hostsfile "$cfg" dhcphostsfile [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" |