From 2352f00e4ff2cd102a4d591d67aba8e1c7eaa7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Wed, 3 Dec 2014 14:06:19 +0100 Subject: [PATCH] Remove the last references to overlayfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This only renames docker internal structures. It has no impact on the end-user. Signed-off-by: Lénaïc Huard --- daemon/daemon_overlay.go | 7 +++++ daemon/daemon_overlayfs.go | 7 ----- .../{overlayfs => overlay}/copy.go | 6 ++-- .../overlayfs.go => overlay/overlay.go} | 6 ++-- daemon/graphdriver/overlay/overlay_test.go | 28 +++++++++++++++++++ .../graphdriver/overlayfs/overlayfs_test.go | 28 ------------------- 6 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 daemon/daemon_overlay.go delete mode 100644 daemon/daemon_overlayfs.go rename daemon/graphdriver/{overlayfs => overlay}/copy.go (94%) rename daemon/graphdriver/{overlayfs/overlayfs.go => overlay/overlay.go} (98%) create mode 100644 daemon/graphdriver/overlay/overlay_test.go delete mode 100644 daemon/graphdriver/overlayfs/overlayfs_test.go diff --git a/daemon/daemon_overlay.go b/daemon/daemon_overlay.go new file mode 100644 index 0000000000..25d6e80285 --- /dev/null +++ b/daemon/daemon_overlay.go @@ -0,0 +1,7 @@ +// +build !exclude_graphdriver_overlay + +package daemon + +import ( + _ "github.com/docker/docker/daemon/graphdriver/overlay" +) diff --git a/daemon/daemon_overlayfs.go b/daemon/daemon_overlayfs.go deleted file mode 100644 index e134b297a9..0000000000 --- a/daemon/daemon_overlayfs.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build !exclude_graphdriver_overlayfs - -package daemon - -import ( - _ "github.com/docker/docker/daemon/graphdriver/overlayfs" -) diff --git a/daemon/graphdriver/overlayfs/copy.go b/daemon/graphdriver/overlay/copy.go similarity index 94% rename from daemon/graphdriver/overlayfs/copy.go rename to daemon/graphdriver/overlay/copy.go index 4c8c6239ac..ae6bee517b 100644 --- a/daemon/graphdriver/overlayfs/copy.go +++ b/daemon/graphdriver/overlay/copy.go @@ -1,6 +1,6 @@ // +build linux -package overlayfs +package overlay import ( "fmt" @@ -122,8 +122,8 @@ func copyDir(srcDir, dstDir string, flags CopyFlags) error { return err } - // We need to copy this attribute if it appears in an overlayfs upper layer, as - // this function is used to copy those. It is set by overlayfs if a directory + // We need to copy this attribute if it appears in an overlay upper layer, as + // this function is used to copy those. It is set by overlay if a directory // is removed and then re-created and should not inherit anything from the // same dir in the lower dir. if err := copyXattr(srcPath, dstPath, "trusted.overlay.opaque"); err != nil { diff --git a/daemon/graphdriver/overlayfs/overlayfs.go b/daemon/graphdriver/overlay/overlay.go similarity index 98% rename from daemon/graphdriver/overlayfs/overlayfs.go rename to daemon/graphdriver/overlay/overlay.go index fbe6b48083..c45c3ea7ad 100644 --- a/daemon/graphdriver/overlayfs/overlayfs.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -1,6 +1,6 @@ // +build linux -package overlayfs +package overlay import ( "bufio" @@ -94,7 +94,7 @@ func init() { } func Init(home string, options []string) (graphdriver.Driver, error) { - if err := supportsOverlayfs(); err != nil { + if err := supportsOverlay(); err != nil { return nil, graphdriver.ErrNotSupported } @@ -111,7 +111,7 @@ func Init(home string, options []string) (graphdriver.Driver, error) { return NaiveDiffDriverWithApply(d), nil } -func supportsOverlayfs() error { +func supportsOverlay() error { // We can try to modprobe overlay first before looking at // proc/filesystems for when overlay is supported exec.Command("modprobe", "overlay").Run() diff --git a/daemon/graphdriver/overlay/overlay_test.go b/daemon/graphdriver/overlay/overlay_test.go new file mode 100644 index 0000000000..88194e4ff8 --- /dev/null +++ b/daemon/graphdriver/overlay/overlay_test.go @@ -0,0 +1,28 @@ +package overlay + +import ( + "github.com/docker/docker/daemon/graphdriver/graphtest" + "testing" +) + +// This avoids creating a new driver for each test if all tests are run +// Make sure to put new tests between TestOverlaySetup and TestOverlayTeardown +func TestOverlaySetup(t *testing.T) { + graphtest.GetDriver(t, "overlay") +} + +func TestOverlayCreateEmpty(t *testing.T) { + graphtest.DriverTestCreateEmpty(t, "overlay") +} + +func TestOverlayCreateBase(t *testing.T) { + graphtest.DriverTestCreateBase(t, "overlay") +} + +func TestOverlayCreateSnap(t *testing.T) { + graphtest.DriverTestCreateSnap(t, "overlay") +} + +func TestOverlayTeardown(t *testing.T) { + graphtest.PutDriver(t) +} diff --git a/daemon/graphdriver/overlayfs/overlayfs_test.go b/daemon/graphdriver/overlayfs/overlayfs_test.go deleted file mode 100644 index 7ab71d0e64..0000000000 --- a/daemon/graphdriver/overlayfs/overlayfs_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package overlayfs - -import ( - "github.com/docker/docker/daemon/graphdriver/graphtest" - "testing" -) - -// This avoids creating a new driver for each test if all tests are run -// Make sure to put new tests between TestOverlayfsSetup and TestOverlayfsTeardown -func TestOverlayfsSetup(t *testing.T) { - graphtest.GetDriver(t, "overlayfs") -} - -func TestOverlayfsCreateEmpty(t *testing.T) { - graphtest.DriverTestCreateEmpty(t, "overlayfs") -} - -func TestOverlayfsCreateBase(t *testing.T) { - graphtest.DriverTestCreateBase(t, "overlayfs") -} - -func TestOverlayfsCreateSnap(t *testing.T) { - graphtest.DriverTestCreateSnap(t, "overlayfs") -} - -func TestOverlayfsTeardown(t *testing.T) { - graphtest.PutDriver(t) -}