Put the bridge interface name in the command line

Upstream-commit: f39af7e05da437d6ac95b19ccfa401598d1fb5d9
Component: engine

components/engine/docker/docker.go

@@ -22,7 +22,13 @@ func main() {
 	// FIXME: Switch d and D ? (to be more sshd like)
 	flDaemon := flag.Bool("d", false, "Daemon mode")
 	flDebug := flag.Bool("D", false, "Debug mode")
+	bridgeName := flag.String("br", "", "")
 	flag.Parse()
+	if *bridgeName != "" {
+		docker.NetworkBridgeIface = *bridgeName
+	} else {
+		docker.NetworkBridgeIface = "lxcbr0"
+	}
 	if *flDebug {
 		os.Setenv("DEBUG", "1")
 	}

components/engine/network.go

@@ -11,10 +11,11 @@ import (
 	"strings"
 )
 
+var NetworkBridgeIface string
+
 const (
-	networkBridgeIface = "lxcbr0"
-	portRangeStart     = 49153
-	portRangeEnd       = 65535
+	portRangeStart = 49153
+	portRangeEnd   = 65535
 )
 
 // Calculates the first and last IP addresses in an IPNet

components/engine/runtime.go

@@ -267,7 +267,7 @@ func NewRuntimeFromDirectory(root string) (*Runtime, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Couldn't create Tag store: %s", err)
 	}
-	netManager, err := newNetworkManager(networkBridgeIface)
+	netManager, err := newNetworkManager(NetworkBridgeIface)
 	if err != nil {
 		return nil, err
 	}