]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
On squeeze the iff file has a different name
authorPeter Palfrader <peter@palfrader.org>
Thu, 16 Sep 2010 11:30:42 +0000 (13:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 16 Sep 2010 11:30:42 +0000 (13:30 +0200)
modules/ntp/files/etc-default-ntp

index 68df55542fb41d8d8e8ff89a291bd0177c05e13f..0e77066f67aa60ebf672a998555b347fcde72f6d 100644 (file)
@@ -14,7 +14,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:
        #