Skip to content

D
Dnsmasq
Commit 44eb875a authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Handle change in format of Debian /usr/share/dns/root.ds.

parent bc87e609
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
debian/changelog
View file @ 44eb875a
...@@ -3,6 +3,8 @@ dnsmasq (2.77-1) unstable; urgency=low ...@@ -3,6 +3,8 @@ dnsmasq (2.77-1) unstable; urgency=low
* New upstream. * New upstream.
* Don't register as a resolvconf source when config file * Don't register as a resolvconf source when config file
includes port=0 to disable DNS. includes port=0 to disable DNS.
* Handle gratuitous format change in /usr/share/dns/root.ds
(closes: #858506) (closes: #860064)
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 11 Apr 2017 14:19:20 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Tue, 11 Apr 2017 14:19:20 +0000
......
debian/init
View file @ 44eb875a
...@@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service" ...@@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service"
ROOT_DS="/usr/share/dns/root.ds" ROOT_DS="/usr/share/dns/root.ds"
if [ -f $ROOT_DS ]; then if [ -f $ROOT_DS ]; then
DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/". IN DS "/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`" DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/"^.*DS[\t ]"/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`"
fi fi
start() start()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment