make: allow setting the default network locking backend #2583
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adrianreber
force-pushed
the
2025-02-04-nftables-make
branch
8 times, most recently
from
3b74eb1 to
c359297
Compare
rst0git
reviewed
Feb 5, 2025
rst0git
reviewed
Feb 5, 2025
rst0git
reviewed
Feb 5, 2025
rst0git
reviewed
Feb 5, 2025
rst0git
reviewed
Feb 5, 2025
adrianreber
force-pushed
the
2025-02-04-nftables-make
branch
8 times, most recently
from
7d5788c to
b9f4785
Compare
|
@mihalicyn That adds a compile time option to easily switch between backends. |
|
@danishprakash this is a PR which should help you building RPMs with a different network locking backend. |
|
Thanks for this @adrianreber, this is quite helpful. I remember we had this discussion in containers/podman#24799 but if we were to make criu "intelligent" and have it figure out the network locking backend on its own, what issues could we have encountered? |
avagin
reviewed
Feb 13, 2025
|
LGTM. Thanks! |
|
@mihalicyn any comments from your side? |
rst0git
reviewed
Mar 12, 2025
As different Linux distributions are switching away from iptables
to nftables, this makes it easier to compile CRIU with a different
default network locking backend. Instead of changing the source
code it is now possible to select the nft backend like this:
make NETWORK_LOCK_DEFAULT=NETWORK_LOCK_NFTABLES
Signed-off-by: Adrian Reber <[email protected]>
The building section also contains the information how to change the network locking backend without source code changes. Signed-off-by: Adrian Reber <[email protected]>
This uses the same formatting for the make command examples as seen in README.md. Signed-off-by: Adrian Reber <[email protected]>
The tests in others/rpc are running as non-root and fail silently if the nftables network locking backend is used. This switches those tests to skip the network locking. Signed-off-by: Adrian Reber <[email protected]>
If the tests in others/rpc are failing no information about that error can be seen in a CI run. This change displays the log files if the test fails. Signed-off-by: Adrian Reber <[email protected]>
There are a couple of tests that require the iptables binary. Instead of adding a checkskip script, which could also handle this, this change now uses CRIU's feature detection to see if the CRIU feature 'has_ipt_legacy' exists. Signed-off-by: Adrian Reber <[email protected]>
Signed-off-by: Adrian Reber <[email protected]>
adrianreber
force-pushed
the
2025-02-04-nftables-make
branch
2 times, most recently
from
aaf4037 to
05aa096
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the possibility to select a network locking backend during build without the need to change the sources.
It also introduces a test run with iptables uninstalled only relying on nftables.