From 9242b5d9341434a5ae1491f64802df6926340d20 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 5 Sep 2018 19:14:40 +0200 Subject: xtables: Accept --wait in iptables-nft-restore Passing --wait option to iptables-nft-restore led to program abort because the flag parameter was not skipped. Mimick iptables-restore behaviour when encountering --wait or --wait-interval options (but still ignore the parameter). Fixes: b9d7b49d84bc2 ("xtables-compat: restore: sync options with iptables-restore") Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- .../shell/testcases/ipt-restore/0002-parameters_0 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 (limited to 'iptables/tests/shell/testcases/ipt-restore/0002-parameters_0') diff --git a/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 b/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 new file mode 100755 index 00000000..5c8748ec --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-restore/0002-parameters_0 @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +# make sure wait and wait-interval options are accepted + +clean_tempfile() +{ + if [ -n "${tmpfile}" ]; then + rm -f "${tmpfile}" + fi +} + +trap clean_tempfile EXIT + +tmpfile=$(mktemp) || exit 1 + +$XT_MULTI iptables-save -f $tmpfile +$XT_MULTI iptables-restore $tmpfile +$XT_MULTI iptables-restore -w 5 $tmpfile +$XT_MULTI iptables-restore -w 5 -W 1 $tmpfile -- cgit v1.2.3