diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2017-04-11 15:13:09 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2017-04-11 15:13:09 +0100 |
| commit | 44eb875a5ab2e3b862a6b2bc9fbbb919475d2107 (patch) | |
| tree | c8e8a1538eecd7321c1ed8101cb6663e515b7dd0 /debian | |
| parent | bc87e609c20445d874b07e71b63ad7ee0671f5f1 (diff) | |
| download | dnsmasq-44eb875a5ab2e3b862a6b2bc9fbbb919475d2107.tar.gz | |
Handle change in format of Debian /usr/share/dns/root.ds.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/init | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 292c2b8..afe9670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dnsmasq (2.77-1) unstable; urgency=low * New upstream. * Don't register as a resolvconf source when config file 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 diff --git a/debian/init b/debian/init index 46abdc4..49556ad 100644 --- a/debian/init +++ b/debian/init @@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service" ROOT_DS="/usr/share/dns/root.ds" 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 start() |