From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 12 Jul 2019 09:30:12 +0000 (+0200)
Subject: remove base path of runcommand calls
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=c1031ab16cda7208eb161c891eceac31976a74b9;ds=sidebyside

remove base path of runcommand calls

this makes us compatible with both, usrmerged and non-usrmerged
systems, also it's the recommended way - we have a sane PATH in
run_command

Also transform to array calls, if we touch them anyway

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index d4f5d78..c946040 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1748,25 +1748,25 @@ sub enable_bridge_firewall {
 sub iptables_restore_cmdlist {
     my ($cmdlist) = @_;
 
-    run_command("/usr/sbin/iptables-restore -n", input => $cmdlist, errmsg => "iptables_restore_cmdlist");
+    run_command(['iptables-restore', '-n'], input => $cmdlist, errmsg => "iptables_restore_cmdlist");
 }
 
 sub ip6tables_restore_cmdlist {
     my ($cmdlist) = @_;
 
-    run_command("/usr/sbin/ip6tables-restore -n", input => $cmdlist, errmsg => "iptables_restore_cmdlist");
+    run_command(['ip6tables-restore', '-n'], input => $cmdlist, errmsg => "iptables_restore_cmdlist");
 }
 
 sub ipset_restore_cmdlist {
     my ($cmdlist) = @_;
 
-    run_command("/usr/sbin/ipset restore", input => $cmdlist, errmsg => "ipset_restore_cmdlist");
+    run_command(['ipset restore'], input => $cmdlist, errmsg => "ipset_restore_cmdlist");
 }
 
 sub ebtables_restore_cmdlist {
     my ($cmdlist) = @_;
 
-    run_command("/usr/sbin/ebtables-restore", input => $cmdlist, errmsg => "ebtables_restore_cmdlist");
+    run_command(['ebtables-restore'], input => $cmdlist, errmsg => "ebtables_restore_cmdlist");
 }
 
 sub iptables_get_chains {
@@ -1825,7 +1825,7 @@ sub iptables_get_chains {
 	}
     };
 
-    run_command("/usr/sbin/$iptablescmd-save", outfunc => $parser);
+    run_command(["$iptablescmd-save"], outfunc => $parser);
 
     return wantarray ? ($res, $hooks) : $res;
 }
@@ -1869,7 +1869,7 @@ sub ipset_get_chains {
 	}
     };
 
-    run_command("/usr/sbin/ipset save", outfunc => $parser);
+    run_command(['ipset', 'save'], outfunc => $parser);
 
     # compute digest for each chain
     foreach my $chain (keys %$chains) {
@@ -1900,7 +1900,7 @@ sub ebtables_get_chains {
 	}
     };
 
-    run_command("/usr/sbin/ebtables-save", outfunc => $parser);
+    run_command(['ebtables-save'], outfunc => $parser);
     # compute digest for each chain and store rules as well
     foreach my $chain (keys %$chains) {
 	$res->{$chain}->{rules} = $chains->{$chain};
@@ -4259,7 +4259,7 @@ sub update_nf_conntrack_logging {
 	my $tmpfile = "$pve_fw_status_dir/log_nf_conntrack";
 	PVE::Tools::file_set_contents($tmpfile, $value);
 
-	PVE::Tools::run_command([qw(systemctl try-reload-or-restart pvefw-logger.service)]);
+	run_command([qw(systemctl try-reload-or-restart pvefw-logger.service)]);
 	$log_nf_conntrack_enabled = $value;
     }
 }