From 8944fb2e9b07d5a764f8d48065b9afd73364f640 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@docker.com>
Date: Thu, 20 Mar 2014 21:51:28 +0000
Subject: [PATCH] rename lxc to bridge
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
---
builtins/builtins.go | 7 +++----
runtime/networkdriver/{lxc => bridge}/driver.go | 2 +-
runtime/runtime.go | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
rename runtime/networkdriver/{lxc => bridge}/driver.go (99%)
diff --git a/builtins/builtins.go b/builtins/builtins.go
index 86f3973c62..10ee9b19e6 100644
--- a/builtins/builtins.go
+++ b/builtins/builtins.go
@@ -1,10 +1,9 @@
package builtins
import (
- "github.com/dotcloud/docker/engine"
-
"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"
)
@@ -35,5 +34,5 @@ func remote(eng *engine.Engine) {
//
func daemon(eng *engine.Engine) {
eng.Register("initserver", server.InitServer)
- eng.Register("init_networkdriver", lxc.InitDriver)
+ eng.Register("init_networkdriver", bridge.InitDriver)
}
diff --git a/runtime/networkdriver/lxc/driver.go b/runtime/networkdriver/bridge/driver.go
similarity index 99%
rename from runtime/networkdriver/lxc/driver.go
rename to runtime/networkdriver/bridge/driver.go
index 827de2a609..41588b1c27 100644
--- a/runtime/networkdriver/lxc/driver.go
+++ b/runtime/networkdriver/bridge/driver.go
@@ -1,4 +1,4 @@
-package lxc
+package bridge
import (
"fmt"
diff --git a/runtime/runtime.go b/runtime/runtime.go
index 38a1beccd2..0d3468e350 100644
--- a/runtime/runtime.go
+++ b/runtime/runtime.go
@@ -17,7 +17,7 @@ import (
"github.com/dotcloud/docker/runtime/execdriver/lxc"
"github.com/dotcloud/docker/runtime/graphdriver"
_ "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/utils"
"io"