diff --git a/docker/docker.go b/docker/docker.go index e9522ba429..85bfc8e551 100644 --- a/docker/docker.go +++ b/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") } diff --git a/network.go b/network.go index fe700bd61c..4a583e2f1e 100644 --- a/network.go +++ b/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 diff --git a/runtime.go b/runtime.go index 950ea404a1..97752a2ab5 100644 --- a/runtime.go +++ b/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 }