1
0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00

Merge pull request #69 from crosbymichael/rename-dummy

Rename dummy driver to vfs
Upstream-commit: 41704d8933990eda71ac511e0c13593264468fb9
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-11-25 09:42:50 -08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
package dummy
package vfs
import (
"fmt"
@@ -9,7 +9,7 @@ import (
)
func init() {
graphdriver.Register("dummy", Init)
graphdriver.Register("vfs", Init)
}
func Init(home string) (graphdriver.Driver, error) {
@@ -24,7 +24,7 @@ type Driver struct {
}
func (d *Driver) String() string {
return "dummy"
return "vfs"
}
func (d *Driver) Status() [][2]string {

View File

@@ -10,7 +10,7 @@ import (
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/graphdriver/aufs"
_ "github.com/dotcloud/docker/graphdriver/devmapper"
_ "github.com/dotcloud/docker/graphdriver/dummy"
_ "github.com/dotcloud/docker/graphdriver/vfs"
"github.com/dotcloud/docker/utils"
"io"
"io/ioutil"
@@ -663,7 +663,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) {
// We don't want to use a complex driver like aufs or devmapper
// for volumes, just a plain filesystem
volumesDriver, err := graphdriver.GetDriver("dummy", config.Root)
volumesDriver, err := graphdriver.GetDriver("vfs", config.Root)
if err != nil {
return nil, err
}