Update modprobe bridge output
This commit is contained in:
parent
9ec67edb66
commit
4d60688464
|
@ -108,8 +108,8 @@ func newDriver() driverapi.Driver {
|
||||||
func Init(dc driverapi.DriverCallback) error {
|
func Init(dc driverapi.DriverCallback) error {
|
||||||
// try to modprobe bridge first
|
// try to modprobe bridge first
|
||||||
// see gh#12177
|
// see gh#12177
|
||||||
if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat", "br_netfilter").Output(); err != nil {
|
if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat", "br_netfilter").CombinedOutput(); err != nil {
|
||||||
logrus.Warnf("Running modprobe bridge nf_nat failed with message: %s, error: %v", out, err)
|
logrus.Warnf("Running modprobe bridge nf_nat br_netfilter failed with message: %s, error: %v", out, err)
|
||||||
}
|
}
|
||||||
if err := iptables.RemoveExistingChain(DockerChain, iptables.Nat); err != nil {
|
if err := iptables.RemoveExistingChain(DockerChain, iptables.Nat); err != nil {
|
||||||
logrus.Warnf("Failed to remove existing iptables entries in %s : %v", DockerChain, err)
|
logrus.Warnf("Failed to remove existing iptables entries in %s : %v", DockerChain, err)
|
||||||
|
|
Loading…
Reference in New Issue