--- doc/loncapafiles/ntpcheck.piml	2019/10/28 16:24:23	1.39
+++ doc/loncapafiles/ntpcheck.piml	2020/11/02 20:05:35	1.47
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.39 2019/10/28 16:24:23 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.47 2020/11/02 20:05:35 raeburn Exp $ -->
 
 <!--
 
@@ -36,9 +36,14 @@ http://www.lon-capa.org/
 <target dist="default"></target>
 <perlscript mode="fg">
 print "Checking to be sure the Network Time Protocol is running properly.\n";
-if (('<DIST />' eq 'sles15') || ('<DIST />' eq 'centos8') || 
-    ('<DIST />' eq 'rhes8')  || ('<DIST />' eq 'oracle7') ||
-    ('<DIST />' eq 'oracle8')) {
+if (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
+    ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
+    ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
+    ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+    ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'centos8')  ||
+    ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'oracle8')  || ('<DIST />' eq 'ubuntu18') ||
+    ('<DIST />' eq 'ubuntu20')) {
     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";
@@ -56,24 +61,33 @@ if (('<DIST />' eq 'fedora15')    || ('<
     ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
     ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
     ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
-    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'centos7')  ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'centos7')  ||
     ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
     ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')   ||
     ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
-    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  ||
-    ('<DIST />' eq 'oracle8')) {
+    ('<DIST />' eq 'ubuntu20')    || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
-    if ('<DIST />' eq 'ubuntu18') {
-        $NTPD = 'ntp';
-    } elsif (('<DIST />' eq 'sles15')  || ('<DIST />' eq 'rhes8')   || 
-             ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle7') ||
-             ('<DIST />' eq 'oracle8') || ('<DIST />' eq 'fedora31')) {
+    my $binname = $NTPD;
+    if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
+        $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') ||
+             ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+             ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'rhes8')    ||
+             ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'oracle7')  ||
+             ('<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;
     }
@@ -117,12 +131,13 @@ if (('<DIST />' eq 'fedora15')    || ('<
     ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
     ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
     ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
-    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'centos7')  || 
-    ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'rhes7')    || 
     ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')   ||
-    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
-    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  ||
-    ('<DIST />' eq 'oracle8')) {
+    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') || 
+    ('<DIST />' eq 'ubuntu20')    || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')) {
     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";
     }