Merge pull request #10110 from jfrazelle/fix-vfs-issue

Jessie Frazelle · Jessie Frazelle · commit ae493e721ee2 · 2015-01-14T19:54:17.000-08:00
ignore vfs from graphdriver warning
diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go
@@ -148,7 +148,7 @@ func New(root string, options []string) (driver Driver, err error) {
 func checkPriorDriver(name, root string) {
 	priorDrivers := []string{}
 	for prior := range drivers {
-		if prior != name {
+		if prior != name && prior != "vfs" {
 			if _, err := os.Stat(path.Join(root, prior)); err == nil {
 				priorDrivers = append(priorDrivers, prior)
 			}

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func New(root string, options []string) (driver Driver, err error) {`
`148`	`148`	`func checkPriorDriver(name, root string) {`
`149`	`149`	`priorDrivers := []string{}`
`150`	`150`	`for prior := range drivers {`
`151`		`- if prior != name {`
	`151`	`+ if prior != name && prior != "vfs" {`
`152`	`152`	`if _, err := os.Stat(path.Join(root, prior)); err == nil {`
`153`	`153`	`priorDrivers = append(priorDrivers, prior)`
`154`	`154`	`}`