--- doc/loncapafiles/ntpcheck.piml	2019/10/28 16:34:48	1.41
+++ doc/loncapafiles/ntpcheck.piml	2019/12/03 04:55:10	1.42
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.41 2019/10/28 16:34:48 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.42 2019/12/03 04:55:10 raeburn Exp $ -->
 
 <!--
 
@@ -41,13 +41,14 @@ if (('<DIST />' eq 'fedora26') || ('<DIS
     ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
     ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'centos8')  || 
     ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'oracle7')  ||
-    ('<DIST />' eq 'oracle8')) {
+    ('<DIST />' eq 'oracle8')  || ('<DIST />' eq 'ubuntu18')) {
     print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
 } else {
     print "For more information on ntpd please see http://www.ntp.org/\n";
 }
 my $NTPD;
 my $name = 'ntp';
+my $binname = $name;
 my $checkcmd = 'ps -ef |grep ntp |grep -v grep |grep -v ntpcheck';
 my $startntpcmd;
 my $is_running;
@@ -67,7 +68,9 @@ if (('<DIST />' eq 'fedora15')    || ('<
     ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
     if ('<DIST />' eq 'ubuntu18') {
-        $NTPD = 'ntp';
+        $NTPD = 'chrony';
+        $name = $NTPD;
+        $binname = 'chronyd';  
     } elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
              ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
              ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
@@ -76,10 +79,11 @@ if (('<DIST />' eq 'fedora15')    || ('<
              ('<DIST />' eq 'oracle8')) {
         $NTPD = 'chronyd';
         $name = $NTPD;
+        $binname = $NTPD;
     }
     $checkcmd = "systemctl is-enabled $NTPD.service";
     $startntpcmd = "systemctl start $NTPD.service";
-    if (!-e "/usr/sbin/$NTPD") {
+    if (!-e "/usr/sbin/$binname") {
         print "$name is not installed.\n";
         exit;
     }