Bläddra i källkod

try to modprobe bridge

Signed-off-by: Jessica Frazelle <jess@docker.com>
(cherry picked from commit b3867b889960604904a4afbab6450bb9528afe06)
Jessica Frazelle 10 år sedan
förälder
incheckning
24cb9df189
1 ändrade filer med 8 tillägg och 0 borttagningar
  1. 8 0
      daemon/networkdriver/bridge/driver.go

+ 8 - 0
daemon/networkdriver/bridge/driver.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"net"
 	"net"
 	"os"
 	"os"
+	"os/exec"
 	"strings"
 	"strings"
 	"sync"
 	"sync"
 
 
@@ -106,6 +107,13 @@ func InitDriver(job *engine.Job) engine.Status {
 		fixedCIDR      = job.Getenv("FixedCIDR")
 		fixedCIDR      = job.Getenv("FixedCIDR")
 		fixedCIDRv6    = job.Getenv("FixedCIDRv6")
 		fixedCIDRv6    = job.Getenv("FixedCIDRv6")
 	)
 	)
+
+	// try to modprobe bridge first
+	// see gh#12177
+	if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat").Output(); err != nil {
+		log.Warnf("Running modprobe bridge nf_nat failed with message: %s, error: %v", out, err)
+	}
+
 	initPortMapper()
 	initPortMapper()
 
 
 	if defaultIP := job.Getenv("DefaultBindingIP"); defaultIP != "" {
 	if defaultIP := job.Getenv("DefaultBindingIP"); defaultIP != "" {