[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Fri Mar 26 18:38:03 2021 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - For distros with firewalld available but masked (iptables preferred), 
    suppress display of: "Warning: firewalld.service changed on disk." message.
  - Fix regexp used to detect if firewalld is active.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.74 doc/install/linux/install.pl:1.75
--- doc/install/linux/install.pl:1.74	Fri Mar 26 17:59:52 2021
+++ doc/install/linux/install.pl	Fri Mar 26 18:38:03 2021
@@ -78,7 +78,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.74 2021/03/26 17:59:52 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.75 2021/03/26 18:38:03 raeburn Exp $'."\n";
 }
 
 #
@@ -886,13 +886,13 @@
     }
     if ($checkfirewalld) {
         my ($loaded,$active);
-        if (open(PIPE,"systemctl status firewalld |")) {
+        if (open(PIPE,"systemctl status firewalld 2>/dev/null |")) {
             while (<PIPE>) {
                 chomp();
                 if (/^\s*Loaded:\s+(\w+)/) {
                     $loaded = $1;
                 }
-                if (/^\s*Active\s+(\w+)/) {
+                if (/^\s*Active:\s+(\w+)/) {
                     $active = $1;
                 }
             }