--- doc/loncapafiles/ntpcheck.piml	2019/12/03 04:55:10	1.42
+++ doc/loncapafiles/ntpcheck.piml	2021/07/28 14:44:30	1.48
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.42 2019/12/03 04:55:10 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.48 2021/07/28 14:44:30 raeburn Exp $ -->
 
 <!--
 
@@ -39,16 +39,17 @@ print "Checking to be sure the Network T
 if (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
     ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
     ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
-    ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'centos8')  || 
-    ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'oracle7')  ||
-    ('<DIST />' eq 'oracle8')  || ('<DIST />' eq 'ubuntu18')) {
+    ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+    ('<DIST />' eq 'fedora34') || ('<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";
 }
 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;
@@ -60,23 +61,27 @@ 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 'scientific7') || ('<DIST />' eq 'sles12')   ||
-    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
-    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'fedora34') ||
+    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'rhes7')    ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'sles12')      || ('<DIST />' eq 'sles15')   || 
+    ('<DIST />' eq 'ubuntu18')    || ('<DIST />' eq 'ubuntu20') || 
+    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  || 
     ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
-    if ('<DIST />' eq 'ubuntu18') {
+    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 'sles15')   || ('<DIST />' eq 'rhes8')    || 
-             ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'oracle7')  ||
-             ('<DIST />' eq 'oracle8')) {
+             ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+             ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'sles15')   ||
+             ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'centos8')  ||
+             ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')) {
         $NTPD = 'chronyd';
         $name = $NTPD;
         $binname = $NTPD;
@@ -127,11 +132,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 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'fedora34') ||
+    ('<DIST />' eq 'scientific7') || ('<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 'sles12')      || ('<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";