--- doc/loncapafiles/ntpcheck.piml	2011/10/25 13:01:32	1.13
+++ doc/loncapafiles/ntpcheck.piml	2014/05/03 15:31:17	1.21
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.13 2011/10/25 13:01:32 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.21 2014/05/03 15:31:17 raeburn Exp $ -->
 
 <!--
 
@@ -38,29 +38,17 @@ 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 (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')) {
+my $checkcmd = 'ps -ef |grep ntp |grep -v grep';
+my $startntpcmd;
+my $is_running;
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || 
+    ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
+    ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')) {
     $NTPD = 'ntpd';
+    $startntpcmd = 'systemctl start ntpd.service';
     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 {
     if (-e "/etc/init.d/ntpd") {
@@ -73,20 +61,31 @@ if (('<DIST />' eq 'fedora15') || ('<DIS
         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";
+    $startntpcnd = "/etc/init.d/$NTPD start";
+}
+
+if (open(PIPE,'-|',$checkcmd)) {
+    $is_running = &lt;PIPE&gt;;
+    chomp($is_running);
+    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 $startntpcmd\n";
     }
+} else {
+    print "Could not determine ntp status.\n";
 }
+
 # chkconfig barfs to stderr if the target isn't set up right.
 my $checking_bin;
 my $restartchk;
-if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' '<DIST />' eq 'ubuntu14') {
     $checking_bin = '/usr/sbin/sysv-rc-conf';
 } else {
     $checking_bin = '/sbin/chkconfig';
 }
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16')) {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || 
+    ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
+    ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')) {
     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";
     }