From 77f68f74c7e6fc977fb2681c7ee60ac652be983e Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Mon, 24 Feb 2014 16:42:30 -0800
Subject: [PATCH] Rename namespace driver to docker
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com>
(github: crosbymichael)
---
execdriver/{namespaces => docker}/default_template.go | 2 +-
execdriver/{namespaces => docker}/driver.go | 2 +-
execdriver/{namespaces => docker}/term.go | 2 +-
runtime.go | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
rename execdriver/{namespaces => docker}/default_template.go (98%)
rename execdriver/{namespaces => docker}/driver.go (99%)
rename execdriver/{namespaces => docker}/term.go (96%)
diff --git a/execdriver/namespaces/default_template.go b/execdriver/docker/default_template.go
similarity index 98%
rename from execdriver/namespaces/default_template.go
rename to execdriver/docker/default_template.go
index f84544adc9..4d6dd954c0 100644
--- a/execdriver/namespaces/default_template.go
+++ b/execdriver/docker/default_template.go
@@ -1,4 +1,4 @@
-package namespaces
+package docker
import (
"github.com/dotcloud/docker/pkg/cgroups"
diff --git a/execdriver/namespaces/driver.go b/execdriver/docker/driver.go
similarity index 99%
rename from execdriver/namespaces/driver.go
rename to execdriver/docker/driver.go
index d948594059..2cd03dd16c 100644
--- a/execdriver/namespaces/driver.go
+++ b/execdriver/docker/driver.go
@@ -1,4 +1,4 @@
-package namespaces
+package docker
import (
"encoding/json"
diff --git a/execdriver/namespaces/term.go b/execdriver/docker/term.go
similarity index 96%
rename from execdriver/namespaces/term.go
rename to execdriver/docker/term.go
index 682c6a27b1..6705fc49e4 100644
--- a/execdriver/namespaces/term.go
+++ b/execdriver/docker/term.go
@@ -1,4 +1,4 @@
-package namespaces
+package docker
import (
"github.com/dotcloud/docker/execdriver"
diff --git a/runtime.go b/runtime.go
index 739cc7ee56..1924687451 100644
--- a/runtime.go
+++ b/runtime.go
@@ -7,8 +7,8 @@ import (
"github.com/dotcloud/docker/dockerversion"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/execdriver"
+ "github.com/dotcloud/docker/execdriver/docker"
_ "github.com/dotcloud/docker/execdriver/lxc"
- "github.com/dotcloud/docker/execdriver/namespaces"
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/graphdriver/aufs"
_ "github.com/dotcloud/docker/graphdriver/btrfs"
@@ -704,7 +704,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig, eng *engine.Engine) (*Runtime
sysInfo := sysinfo.New(false)
- ed, err := namespaces.NewDriver(config.Root)
+ ed, err := docker.NewDriver(config.Root)
if err != nil {
return nil, err
}