projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into staging
[mirror/dsa-puppet.git]
/
modules
/
ntp
/
files
/
etc-default-ntp
diff --git
a/modules/ntp/files/etc-default-ntp
b/modules/ntp/files/etc-default-ntp
index
0e77066
..
91790cd
100644
(file)
--- 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:
#