kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #4800 from vieux/rename_network_driver

Browse source 
rename lxc to bridge
This commit is contained in:
Victor Vieux 2014-03-21 16:52:40 -07:00
commit 97e5295f43
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
builtins/builtins.go
View file

@ -1,10 +1,9 @@
package builtins package builtins
import ( import (
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/api" "github.com/dotcloud/docker/api"
"github.com/dotcloud/docker/runtime/networkdriver/lxc" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/runtime/networkdriver/bridge"
"github.com/dotcloud/docker/server" "github.com/dotcloud/docker/server"
) )
@ -35,5 +34,5 @@ func remote(eng *engine.Engine) {
// //
func daemon(eng *engine.Engine) { func daemon(eng *engine.Engine) {
eng.Register("initserver", server.InitServer) eng.Register("initserver", server.InitServer)
eng.Register("init_networkdriver", lxc.InitDriver) eng.Register("init_networkdriver", bridge.InitDriver)
} }

2
runtime/networkdriver/lxc/driver.go → runtime/networkdriver/bridge/driver.go
View file

@ -1,4 +1,4 @@
package lxc package bridge
import ( import (
"fmt" "fmt"

2
runtime/runtime.go
View file

@ -17,7 +17,7 @@ import (
"github.com/dotcloud/docker/runtime/execdriver/lxc" "github.com/dotcloud/docker/runtime/execdriver/lxc"
"github.com/dotcloud/docker/runtime/graphdriver" "github.com/dotcloud/docker/runtime/graphdriver"
_ "github.com/dotcloud/docker/runtime/graphdriver/vfs" _ "github.com/dotcloud/docker/runtime/graphdriver/vfs"
_ "github.com/dotcloud/docker/runtime/networkdriver/lxc" _ "github.com/dotcloud/docker/runtime/networkdriver/bridge"
"github.com/dotcloud/docker/runtime/networkdriver/portallocator" "github.com/dotcloud/docker/runtime/networkdriver/portallocator"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io" "io"