diff options
| -rw-r--r-- | src/monitor.c | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/sets/0036add_set_element_expiration_0 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/monitor.c b/src/monitor.c index 9e508f8f..3872ebcf 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -849,7 +849,7 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type, break; } } - if (!nft_output_echo(&monh->ctx->nft->output) && genid >= 0) { + if (genid >= 0) { nft_mon_print(monh, "# new generation %d", genid); if (pid >= 0) nft_mon_print(monh, " by process %d (%s)", pid, name); diff --git a/tests/shell/testcases/sets/0036add_set_element_expiration_0 b/tests/shell/testcases/sets/0036add_set_element_expiration_0 index 51ed0f2c..7b2e39a3 100755 --- a/tests/shell/testcases/sets/0036add_set_element_expiration_0 +++ b/tests/shell/testcases/sets/0036add_set_element_expiration_0 @@ -6,7 +6,7 @@ RULESET="add table ip x add set ip x y { type ipv4_addr; flags dynamic,timeout; } add element ip x y { 1.1.1.1 timeout 30s expires 15s }" -test_output=$($NFT -e -f - <<< "$RULESET" 2>&1) +test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | head -n -1) if [ "$test_output" != "$RULESET" ] ; then $DIFF -u <(echo "$test_output") <(echo "$RULESET") |