sudo: replace debbits by publicity

[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 68df55542fb41d8d8e8ff89a291bd0177c05e13f..91790cd4fdda8d7e77e870333c437ed254c3e03b 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:
 #
@@ -14,7 +16,8 @@ h="`hostname`"
 KEYSDIR="/etc/ntp.keys.d"
 if ! [ -e "$KEYSDIR/ntpkey_cert_$h" ] ||
    ! [ -e "$KEYSDIR/ntpkey_host_$h" ] ||
-   ! [ -e "$KEYSDIR/ntpkey_iff_$h" ]; then
+   (! [ -e "$KEYSDIR/ntpkey_iff_$h" ] &&
+    ! [ -e "$KEYSDIR/ntpkey_iffkey_$h" ]); then
        # on a "server" we would have to add -T to the ntp-keygen call
        # and then run something like this:
        #