[pkg-ntp-maintainers] Bug#617965: [ntpdate] ntpdate-debian ignore dhcp option

[Christian Ehrhardt]

Hi,
I just came over this long dormant bug in Ubuntu and I saw it was just as
that in Debian.
IMHO the patch still makes sense, it also still applies.
And I see no reason to not just fix this in Debian first.

It reads a bit weird as /var/lib/ntp/ntp.conf.dhcp could be checked twice
if NTPDATE_USE_NTP_CONF is set. But that could be solved by moving the new
section down after the check of local files.
This also allows for a default.dhcp that does not specify NTPSERVERS to
fall back to the local config.

A patch with these small modifications would look like this:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-ntp-maintainers/attachments/20160504/edd07b90/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-617965-dont-ignore-dhcp.patch
Type: text/x-patch
Size: 882 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-ntp-maintainers/attachments/20160504/edd07b90/attachment.bin>