Skip to content

pbr-1.2.4: restore nft4 and nft6 for shell user files - #204

Merged
stangri merged 1 commit into
mossdef-org:1.2.4from
egc112:pbr-1.2.4-user-file-nft4-nft6
Nov 9, 2026
Merged

stangri merged 1 commit into
mossdef-org:1.2.4from
egc112:pbr-1.2.4-user-file-nft4-nft6

Conversation

@egc112

@egc112 egc112 commented Nov 8, 2026

Copy link
Copy Markdown
Collaborator

The 1.2.2 shell implementation gave user files nft, nft4 and nft6. The wrapper the ucode version writes around a shell user file only defines nft, so nft4 and nft6 are "not found". The wrapper's exit code is that of the file's last command, so a file that does not end on one of those calls exits 0 and its rules are lost without any error.

Define both, keeping the ipv6_enabled gating nft6 had, and which api.nft6() has for ucode user files.

Found by the review of openwrt/packages#31156. Two new tests check the wrapper with ipv6_enabled off and on; each passes 1/3 without the fix. Checked on OpenWrt 25.12 with a real shell user file: stock pbr installed only the nft rules and reported no error; with this change the nft4 and nft6 rules are installed, and the nft6 rule is left out with ipv6_enabled off.

Assisted-by: Claude:claude-opus-5-5

The 1.2.2 shell implementation gave user files nft, nft4 and nft6. The
wrapper the ucode version writes around a shell user file only defines
nft, so nft4 and nft6 are "not found". The wrapper's exit code is that of
the file's last command, so a file that does not end on one of those
calls exits 0 and its rules are lost without any error.

Define both, keeping the ipv6_enabled gating nft6 had, and which
api.nft6() has for ucode user files.

Found by the review of openwrt/packages#31156. Two new tests check the
wrapper with ipv6_enabled off and on; each passes 1/3 without the fix.
Checked on OpenWrt 25.12 with a real shell user file: stock pbr installed
only the nft rules and reported no error; with this change the nft4 and
nft6 rules are installed, and the nft6 rule is left out with
ipv6_enabled off.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Erik Conijn <egc112@msn.com>
@stangri
stangri merged commit 5702868 into mossdef-org:1.2.4 Nov 9, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants