Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter

modprobe br_netfilter
Upstream-commit: e0777e69cba057d7c7da360ed2745d9de8b61ed2
Component: engine
This commit is contained in:
Michael Crosby
2015-05-12 13:46:34 -07:00
@@ -124,7 +124,7 @@ func InitDriver(config *Config) error {
// try to modprobe bridge first
// see gh#12177
if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat").Output(); err != nil {
if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat", "br_netfilter").Output(); err != nil {
logrus.Warnf("Running modprobe bridge nf_nat failed with message: %s, error: %v", out, err)
}