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

Remove the last references to overlayfs

Browse source 
This only renames docker internal structures.
It has no impact on the end-user.

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
This commit is contained in:
Lénaïc Huard 2014-12-03 14:06:19 +01:00
parent d680ca5c96
commit 2352f00e4f
6 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/daemon_overlay.go Normal file
View file

@ -0,0 +1,7 @@
// +build !exclude_graphdriver_overlay
package daemon
import (
_ "github.com/docker/docker/daemon/graphdriver/overlay"
)

7
daemon/daemon_overlayfs.go
View file

@ -1,7 +0,0 @@
// +build !exclude_graphdriver_overlayfs
package daemon
import (
_ "github.com/docker/docker/daemon/graphdriver/overlayfs"
)

6
daemon/graphdriver/overlayfs/copy.go → daemon/graphdriver/overlay/copy.go
View file

@ -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 {

6
daemon/graphdriver/overlayfs/overlayfs.go → daemon/graphdriver/overlay/overlay.go
View file

@ -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()

28
daemon/graphdriver/overlay/overlay_test.go Normal file
View file

@ -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)
}

28
daemon/graphdriver/overlayfs/overlayfs_test.go
View file

@ -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)
}