diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-01-21 17:12:58 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-01-21 17:12:58 +0100 |
| commit | 7586d7f0b6fb9f24ba2d406941d963cf5b0068e8 (patch) | |
| tree | 706476af37973e6f404eef1c72e4a22e932a5917 | |
| parent | 62399a8b32b0e908fd91d30e2d2479c073f3def6 (diff) | |
| download | vyatta-op-7586d7f0b6fb9f24ba2d406941d963cf5b0068e8.tar.gz vyatta-op-7586d7f0b6fb9f24ba2d406941d963cf5b0068e8.zip | |
T523: Use new location for dnsmasq config files
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-op-dns-forwarding.pl | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8d8625e..14f8078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-op (0.14.0+vyos2+current4) unstable; urgency=medium + + * T523: Use new location for dnsmasq config files + + -- Christian Poessinger <christian@poessinger.com> Sun, 21 Jan 2018 17:10:30 +0100 + vyatta-op (0.14.0+vyos2+current3) unstable; urgency=medium * Changed 'show tech-support' implementation to a redacted output, private diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index 5f94c15..ae72b37 100755 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -122,7 +122,7 @@ sub get_dns_nameservers { my @use_dhcp_nameservers = $vyatta_config->returnOrigValues("dhcp"); my @use_nameservers = $vyatta_config->returnOrigValues("name-server"); my @resolv_conf_nameservers = `grep "^nameserver" /etc/resolv.conf`; - my @dnsmasq_conf_nameservers = `grep "server=" /etc/dnsmasq.conf`; + my @dnsmasq_conf_nameservers = `grep "server=" /etc/dnsmasq.d/vyos.conf`; my @dnsmasq_running = `ps ax | grep dnsmasq | grep -v grep`; if (!(defined $use_system_nameservers) && (@use_dhcp_nameservers == 0) && (@use_nameservers == 0)) { |