[pkg-ntp-maintainers] Bug#560046: Add option to ignore DHCP timeservers

[Anthony DeRobertis]

Package: ntp
Version: 1:4.2.4p7+dfsg-4
Severity: normal
File: /etc/init.d/ntp
Tags: patch

Especially with static DHCP (where you always have the DHCP server give
the same IP to a given MAC), you wind up with servers on DHCP.
Including, say, time servers.

The attached patch adds a IGNORE_DHCP option to /etc/default/ntp to
allow you to completely ignore the timeservers given by DHCP.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (100, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.31-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ntp depends on:
ii  adduser                  3.111           add and remove users and groups
ii  libc6                    2.10.2-2        GNU C Library: Shared libraries
ii  libcap2                  1:2.17-2        support for getting/setting POSIX.
ii  libedit2                 2.11-20080614-1 BSD editline and history libraries
ii  libncurses5              5.7+20090803-2  shared libraries for terminal hand
ii  libssl0.9.8              0.9.8k-6        SSL shared libraries
ii  lsb-base                 3.2-23          Linux Standard Base 3.2 init scrip
ii  netbase                  4.37            Basic TCP/IP networking system

Versions of packages ntp recommends:
ii  perl                          5.10.1-8   Larry Wall's Practical Extraction 

Versions of packages ntp suggests:
pn  ntp-doc                       <none>     (no description available)

-- no debconf information
-------------- next part --------------
--- ntp.old	2009-12-08 10:15:59.000000000 -0500
+++ ntp	2009-12-08 10:20:38.000000000 -0500
@@ -22,7 +22,7 @@
 	. /etc/default/ntp
 fi
 
-if [ -e /var/lib/ntp/ntp.conf.dhcp ]; then
+if [ "yes" != "$IGNORE_DHCP" ] && [ -e /var/lib/ntp/ntp.conf.dhcp ]; then
 	NTPD_OPTS="$NTPD_OPTS -c /var/lib/ntp/ntp.conf.dhcp"
 fi