Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modprobe when needed #1040

Merged
merged 1 commit into from
Mar 22, 2016
Merged

modprobe when needed #1040

merged 1 commit into from
Mar 22, 2016

Conversation

aboch
Copy link
Contributor

@aboch aboch commented Mar 21, 2016

  • in bridge driver modprobe for br_netfilter only if EnableIPTables==true
  • also call FirewalldInit() only if EnableIPTables==true
  • move modprobe for nf_nat and xt_conntrack in iptables.initCheck()

Related to moby/moby#16964

Signed-off-by: Alessandro Boch aboch@docker.com

logrus.Warnf("Running modprobe bridge br_netfilter failed with message: %s, error: %v", out, err)
}
}
if err := iptables.FirewalldInit(); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By moving FirewalldInit() under EnableIPTables, this might impact other drivers inadvertently that uses IPTables for its operation (such as Overlay in Kernel < 3.16).
This should be moved to iptables package. WDYT ?

- in bridge driver modprobe for br_netfilter only if EnableIPTables==true
- move FirewalldInit() to iptables pakcage Init()
- move modprobe for nf_nat and xt_conntrack in iptables.initCheck()

Signed-off-by: Alessandro Boch <aboch@docker.com>
@mrjana
Copy link
Contributor

mrjana commented Mar 22, 2016

LGTM

1 similar comment
@chenchun
Copy link
Contributor

LGTM

chenchun added a commit that referenced this pull request Mar 22, 2016
@chenchun chenchun merged commit d430101 into moby:master Mar 22, 2016
@aboch aboch deleted the mp branch June 27, 2016 18:34
@pnedunuri
Copy link

Hello,

A question in lines of "bridge under /proc/sys/net/ being unavailable". Is there a way to modprobe in docker or any other solution to make it available?

Any inputs greatly appreciated!

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants