michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add the -w flag to avoid locks if available https://sourceforge.net/p/webadmin/bugs/5475/

Browse Source
This commit is contained in:
Jamie Cameron
2021-04-13 12:47:51 -07:00
parent 175ed8b3df
commit 3fc3f564d1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
firewall/firewall-lib.pl
View File

@@ -308,6 +308,12 @@ sub create_webmin_init
{
local $res = &has_command("ip${ipvx}tables-restore");
local $ipt = &has_command("ip${ipvx}tables");
local $out = &backquote_command("$res -h 2>&1 </dev/null");
if ($out =~ /\s+-w\s+/) {
# Supports the wait flag, in case two instances are run at once
$res .= " -w";
$ipt .= " -w";
}
local $start = "$res <$ipvx_save";
local $stop = "$ipt -t filter -F\n".
"$ipt -t nat -F\n".
@@ -321,7 +327,8 @@ local $stop = "$ipt -t filter -F\n".
"$ipt -t mangle -P PREROUTING ACCEPT\n".
"$ipt -t mangle -P OUTPUT ACCEPT";
&foreign_require("init", "init-lib.pl");
&init::enable_at_boot("webmin-ip${ipvx}tables", "Load ip${ipvx}tables save file",
&init::enable_at_boot("webmin-ip${ipvx}tables",
"Load ip${ipvx}tables save file",
$start, $stop, undef, { 'exit' => 1 });
}