--- doc/loncapafiles/ntpcheck.piml	2011/05/31 11:27:24	1.12
+++ doc/loncapafiles/ntpcheck.piml	2011/10/26 11:48:39	1.14
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.12 2011/05/31 11:27:24 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.14 2011/10/26 11:48:39 goltermann Exp $ -->
 
 <!--
 
@@ -38,19 +38,45 @@ http://www.lon-capa.org/
 print "Checking to be sure the Network Time Protocol is running properly.\n";
 print "For more information on ntpd please see http://www.ntp.org/\n";
 my $NTPD;
-if (-e "/etc/init.d/ntpd") {
-   $NTPD = "ntpd";
-} elsif (-e "/etc/init.d/xntpd") {
-   $NTPD = "xntpd";
-} elsif (-e "/etc/init.d/ntp") {
-   $NTPD = "ntp"; 
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')) {
+    $NTPD = 'ntpd';
+    if (!-e '/usr/sbin/ntpd') {
+        print "ntp is not installed.\n";
+        exit;
+    } else {
+        if (open(PIPE,"systemctl status ntpd.service|")) {
+            my @lines = &lt;PIPE&gt;;
+            chomp(@lines);
+            my $is_running;
+            foreach my $line (@lines) {
+                if ($line =~ /Active: active/) {
+                    $is_running = 1;
+                    last; 
+                }
+            }
+            close(PIPE);
+            if (!$is_running) {
+                print "WARNING: ntp is installed but is not currently running.\nPlease verify the configuration of ntp in /etc/ntp.conf and /etc/ntp/step-tickers\nStart ntp by executing\n systemctl start ntpd.service|\n";
+            }
+        } else {
+            print "Could not determine ntp status.\n";
+        }
+    }
 } else {
-    print "ntp is not installed.\n";
-    exit;
-}
-my $value = `/etc/init.d/$NTPD status`;
-if ($value !~ /running/) {
-    print "WARNING: ntp is installed but is not currently running.\nPlease verify the configuration of ntp in /etc/ntp.conf and /etc/ntp/step-tickers\nStart ntp by executing\n /etc/init.d/$NTPD start\n";
+    if (-e "/etc/init.d/ntpd") {
+        $NTPD = "ntpd";
+    } elsif (-e "/etc/init.d/xntpd") {
+        $NTPD = "xntpd";
+    } elsif (-e "/etc/init.d/ntp") {
+        $NTPD = "ntp"; 
+    } else {
+        print "ntp is not installed.\n";
+        exit;
+    }
+    my $value = `/etc/init.d/$NTPD status`;
+    if ($value !~ /pid  \d*)/i) {
+        print "WARNING: ntp is installed but is not currently running.\nPlease verify the configuration of ntp in /etc/ntp.conf and /etc/ntp/step-tickers\nStart ntp by executing\n /etc/init.d/$NTPD start\n";
+    }
 }
 # chkconfig barfs to stderr if the target isn't set up right.
 my $checking_bin;
@@ -60,7 +86,7 @@ if ('<DIST />' eq 'debian5' || '<DIST />
 } else {
     $checking_bin = '/sbin/chkconfig';
 }
-if ('<DIST />' eq 'fedora15') {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')) {
     if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {  
         print "**** WARNING: ntpd is not configured to run at boot.  To correct this run:\nsystemctl enable ntpd.service\n";
     }