network: use iptables-restore --wait if available
Avoid bailing out early if multiple instances of iptables-restore are
called simultaneously.
Fixes QubesOS/qubes-issues#3665
(cherry picked from commit 8f6bd245bd
)
This commit is contained in:
parent
d482add57d
commit
c9cf96eeef
|
@ -33,10 +33,16 @@ start() {
|
|||
# Do not start if there is no config file.
|
||||
[ ! -f "$IPTABLES_DATA" ] && return 6
|
||||
|
||||
CMD_ARGS=
|
||||
if "$CMD-restore" --help 2>&1 | grep -q wait=; then
|
||||
CMD_ARGS=--wait
|
||||
fi
|
||||
|
||||
echo -n $"${CMD}: Applying firewall rules: "
|
||||
|
||||
$CMD-restore $IPTABLES_DATA
|
||||
if [ $? -eq 0 ]; then
|
||||
"$CMD-restore" $CMD_ARGS "$IPTABLES_DATA"
|
||||
ret="$?"
|
||||
if [ "$ret" -eq 0 ]; then
|
||||
echo OK
|
||||
else
|
||||
echo FAIL; return 1
|
||||
|
|
Loading…
Reference in New Issue
Block a user