From 20e6d0be01159b198215a3bf16d837f90e31c5a6 Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Mon, 20 Jan 2014 13:52:26 -0500 Subject: [PATCH] Extract mount into pkg. Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it. Docker-DCO-1.1-Signed-off-by: Paul Nasrat (github: pnasrat) Upstream-commit: 2e094db6390dde57263c07665290b1477bb6df7e Component: engine --- components/engine/cgroups/cgroups.go | 2 +- components/engine/container.go | 2 +- components/engine/execdriver/chroot/driver.go | 2 +- components/engine/graphdriver/aufs/aufs.go | 2 +- components/engine/{ => pkg}/mount/MAINTAINERS | 0 components/engine/{ => pkg}/mount/flags_darwin.go | 0 components/engine/{ => pkg}/mount/flags_linux.go | 0 components/engine/{ => pkg}/mount/mount.go | 0 components/engine/{ => pkg}/mount/mount_test.go | 0 components/engine/{ => pkg}/mount/mounter_darwin.go | 0 components/engine/{ => pkg}/mount/mounter_linux.go | 0 components/engine/{ => pkg}/mount/mountinfo.go | 0 components/engine/{ => pkg}/mount/mountinfo_test.go | 0 13 files changed, 4 insertions(+), 4 deletions(-) rename components/engine/{ => pkg}/mount/MAINTAINERS (100%) rename components/engine/{ => pkg}/mount/flags_darwin.go (100%) rename components/engine/{ => pkg}/mount/flags_linux.go (100%) rename components/engine/{ => pkg}/mount/mount.go (100%) rename components/engine/{ => pkg}/mount/mount_test.go (100%) rename components/engine/{ => pkg}/mount/mounter_darwin.go (100%) rename components/engine/{ => pkg}/mount/mounter_linux.go (100%) rename components/engine/{ => pkg}/mount/mountinfo.go (100%) rename components/engine/{ => pkg}/mount/mountinfo_test.go (100%) diff --git a/components/engine/cgroups/cgroups.go b/components/engine/cgroups/cgroups.go index fdcab8c3da..07867a6d58 100644 --- a/components/engine/cgroups/cgroups.go +++ b/components/engine/cgroups/cgroups.go @@ -3,7 +3,7 @@ package cgroups import ( "bufio" "fmt" - "github.com/dotcloud/docker/mount" + "github.com/dotcloud/docker/pkg/mount" "io" "io/ioutil" "os" diff --git a/components/engine/container.go b/components/engine/container.go index 79d9511d7b..f81c374254 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -8,7 +8,7 @@ import ( "github.com/dotcloud/docker/cgroups" "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/graphdriver" - "github.com/dotcloud/docker/mount" + "github.com/dotcloud/docker/pkg/mount" "github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/utils" "github.com/kr/pty" diff --git a/components/engine/execdriver/chroot/driver.go b/components/engine/execdriver/chroot/driver.go index b9f3f04016..749926edf7 100644 --- a/components/engine/execdriver/chroot/driver.go +++ b/components/engine/execdriver/chroot/driver.go @@ -3,7 +3,7 @@ package chroot import ( "fmt" "github.com/dotcloud/docker/execdriver" - "github.com/dotcloud/docker/mount" + "github.com/dotcloud/docker/pkg/mount" "os" "os/exec" ) diff --git a/components/engine/graphdriver/aufs/aufs.go b/components/engine/graphdriver/aufs/aufs.go index 8875cac6d9..2e9fa8298a 100644 --- a/components/engine/graphdriver/aufs/aufs.go +++ b/components/engine/graphdriver/aufs/aufs.go @@ -25,7 +25,7 @@ import ( "fmt" "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/graphdriver" - mountpk "github.com/dotcloud/docker/mount" + mountpk "github.com/dotcloud/docker/pkg/mount" "github.com/dotcloud/docker/utils" "os" "os/exec" diff --git a/components/engine/mount/MAINTAINERS b/components/engine/pkg/mount/MAINTAINERS similarity index 100% rename from components/engine/mount/MAINTAINERS rename to components/engine/pkg/mount/MAINTAINERS diff --git a/components/engine/mount/flags_darwin.go b/components/engine/pkg/mount/flags_darwin.go similarity index 100% rename from components/engine/mount/flags_darwin.go rename to components/engine/pkg/mount/flags_darwin.go diff --git a/components/engine/mount/flags_linux.go b/components/engine/pkg/mount/flags_linux.go similarity index 100% rename from components/engine/mount/flags_linux.go rename to components/engine/pkg/mount/flags_linux.go diff --git a/components/engine/mount/mount.go b/components/engine/pkg/mount/mount.go similarity index 100% rename from components/engine/mount/mount.go rename to components/engine/pkg/mount/mount.go diff --git a/components/engine/mount/mount_test.go b/components/engine/pkg/mount/mount_test.go similarity index 100% rename from components/engine/mount/mount_test.go rename to components/engine/pkg/mount/mount_test.go diff --git a/components/engine/mount/mounter_darwin.go b/components/engine/pkg/mount/mounter_darwin.go similarity index 100% rename from components/engine/mount/mounter_darwin.go rename to components/engine/pkg/mount/mounter_darwin.go diff --git a/components/engine/mount/mounter_linux.go b/components/engine/pkg/mount/mounter_linux.go similarity index 100% rename from components/engine/mount/mounter_linux.go rename to components/engine/pkg/mount/mounter_linux.go diff --git a/components/engine/mount/mountinfo.go b/components/engine/pkg/mount/mountinfo.go similarity index 100% rename from components/engine/mount/mountinfo.go rename to components/engine/pkg/mount/mountinfo.go diff --git a/components/engine/mount/mountinfo_test.go b/components/engine/pkg/mount/mountinfo_test.go similarity index 100% rename from components/engine/mount/mountinfo_test.go rename to components/engine/pkg/mount/mountinfo_test.go