From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 May 2012 13:13:25 +0000 (+0200)
Subject: Get rid of /var/lib/ntp/ntp.conf.dhcp if it exists
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e3d9e188efddf027bd8b68319966fe3f7602994e;p=mirror%2Fdsa-puppet.git

Get rid of /var/lib/ntp/ntp.conf.dhcp if it exists
---

diff --git a/modules/ntp/files/etc-default-ntp b/modules/ntp/files/etc-default-ntp
index 0e77066f6..91790cd4f 100644
--- a/modules/ntp/files/etc-default-ntp
+++ b/modules/ntp/files/etc-default-ntp
@@ -7,6 +7,8 @@
 #
 NTPD_OPTS='-g'
 
+rm -vf /var/lib/ntp/ntp.conf.dhcp
+
 #
 # make sure this host already has ntp keys:
 #