--- doc/loncapafiles/ntpcheck.piml	2020/01/04 18:03:16	1.43
+++ doc/loncapafiles/ntpcheck.piml	2021/12/17 17:48:13	1.49
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.43 2020/01/04 18:03:16 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.49 2021/12/17 17:48:13 raeburn Exp $ -->
 
 <!--
 
@@ -39,7 +39,9 @@ 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 'fedora32') || ('<DIST />' eq 'fedora33') ||
+    ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||  
+    ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'centos8')  ||
     ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'oracle7')  ||
     ('<DIST />' eq 'oracle8')  || ('<DIST />' eq 'ubuntu18') ||
     ('<DIST />' eq 'ubuntu20')) {
@@ -49,7 +51,6 @@ if (('<DIST />' eq 'fedora26') || ('<DIS
 }
 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;
@@ -61,13 +62,16 @@ 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 'fedora35')    || ('<DIST />' eq 'centos7')  ||
     ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
     ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')   ||
-    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
+    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') || 
     ('<DIST />' eq 'ubuntu20')    || ('<DIST />' eq 'rhes8')    || 
-    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')) { 
+    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
+    my $binname = $NTPD;
     if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
         $NTPD = 'chrony';
         $name = $NTPD;
@@ -75,6 +79,8 @@ if (('<DIST />' eq 'fedora15')    || ('<
     } 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 'fedora34') || ('<DIST />' eq 'fedora35') ||
              ('<DIST />' eq 'sles15')   || ('<DIST />' eq 'rhes8')    || 
              ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'oracle7')  ||
              ('<DIST />' eq 'oracle8')) {
@@ -128,12 +134,14 @@ 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 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'fedora34') ||
+    ('<DIST />' eq 'fedora35')    || ('<DIST />' eq 'centos7')  ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'rhes7')    || 
+    ('<DIST />' eq 'oracle7')     || ('<DIST />' eq 'sles12')   ||
     ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
     ('<DIST />' eq 'ubuntu20')    || ('<DIST />' eq 'rhes8')    ||
-    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')) {
+    ('<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";
     }