Move the default bridge name to a constant

docker/docker.go

@@ -27,7 +27,7 @@ func main() {
 	if *bridgeName != "" {
 		docker.NetworkBridgeIface = *bridgeName
 	} else {
-		docker.NetworkBridgeIface = "lxcbr0"
+		docker.NetworkBridgeIface = docker.DefaultNetworkBridge
 	}
 	if *flDebug {
 		os.Setenv("DEBUG", "1")

network.go

@@ -14,8 +14,9 @@ import (
 var NetworkBridgeIface string
 
 const (
-	portRangeStart = 49153
-	portRangeEnd   = 65535
+	DefaultNetworkBridge = "lxcbr0"
+	portRangeStart       = 49153
+	portRangeEnd         = 65535
 )
 
 // Calculates the first and last IP addresses in an IPNet

runtime.go

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