Fix br_netfilter module loading logic#48960
Conversation
|
cc: @robmry |
robmry
left a comment
There was a problem hiding this comment.
Thank you for working on this, much appreciated!
I've made some suggestions ... if they look good to you, please squash commits before pushing updates. Linking to the issue from the PR is good, but it'd be best to remove it from the commit message (so that GitHub doesn't keep adding links everywhere).
|
Tests are failing with ... I guess that's because the directory exists, so I'm wondering if it'd be best to use a |
We can but checking for directory existence is a lot cheaper than invoking a binary. I can make this change if you insist. |
Thanks @sshedi - it's looking good. No need to make that change, it was just a thought. I don't know what's going on with the tests yet, it doesn't look like anything to do with this PR though ... Edit: it's a buildx regression, people who know-stuff are on the case! |
|
Reverted the bump to latest Buildx stable for our actions in docker/actions-toolkit#508. I triggered a re-run of failed jobs, should work now. |
Checking for `/proc/sys/net/bridge` directory alone is not enough to decide if bridge, br_netfilter module to be loaded. Check for specific file for br_netfilter module and then do modprobe if the file is not found under `/proc/sys/net/bridge` Loading br_netfilter implicitly loads bridge module. fixes: moby#48948 Signed-off-by: Shreenidhi Shedi <[email protected]>
Checking for
/proc/sys/net/bridgedirectory alone is not enough to decide if bridge, br_netfilter module to be loaded. Check for specific file for each bridge & br_netfilter module and then do modprobe if the file is not found in/proc/sys/net/bridgeFixes: #48948
Please provide the following information:
-->
- What I did
Fix loading of bridge and br_netfilter kernel modules
- How I did it
By check for presence of specific files for each module in procfs
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)