[pkg-ntp-maintainers] Bug#809344: ntp: changing the default config from server to pool broke the dhcp hook

[Ron]

Package: ntp
Version: 1:4.2.8p3+dfsg-1
Severity: important

Hi,

In 1:4.2.8p3+dfsg-1, the default config was changed to
"Use pool instead of server".  This needs a corresponding
update to /etc/dhcp/dhclient-exit-hooks.d/ntp, since the
DHCP specified servers now get added to the default pool
config instead of replacing them.

The following patch should be all that is needed.

  Cheers,
  Ron


--- ntp.orig	2015-12-30 03:10:24.914957831 +1030
+++ ntp.fixed	2015-12-30 03:10:14.178950817 +1030
@@ -40,7 +40,7 @@
 		echo "server $server iburst"
 	  done
 	  echo
-	  sed -r -e '/^ *(server|peer).*$/d' $NTP_CONF
+	  sed -r -e '/^ *(server|peer|pool).*$/d' $NTP_CONF
 	) >>$tmp
 	
 	mv $tmp $NTP_DHCP_CONF