From 08c55cd94ba51a035889cdc528c861447ed42a0f Mon Sep 17 00:00:00 2001 From: David Calavera Date: Mon, 6 Jul 2015 18:21:44 -0700 Subject: [PATCH] Warn when udev_sync is not supported. Signed-off-by: David Calavera (cherry picked from commit e27131519f610178fd8adfc4b87c7bc2521a562f) --- daemon/graphdriver/devmapper/deviceset.go | 5 +---- daemon/graphdriver/driver.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index e955457b1..e1c886604 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -1033,10 +1033,7 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error { // https://github.com/docker/docker/issues/4036 if supported := devicemapper.UdevSetSyncSupport(true); !supported { - logrus.Errorf("Udev sync is not supported. This will lead to unexpected behavior, data loss and errors. For more information, see https://docs.docker.com/reference/commandline/cli/#daemon-storage-driver-option") - if !devices.overrideUdevSyncCheck { - return graphdriver.ErrNotSupported - } + logrus.Warn("Udev sync is not supported. This will lead to unexpected behavior, data loss and errors. For more information, see https://docs.docker.com/reference/commandline/cli/#daemon-storage-driver-option") } if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) { diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go index 963acdfbb..708c4a896 100644 --- a/daemon/graphdriver/driver.go +++ b/daemon/graphdriver/driver.go @@ -168,7 +168,7 @@ func scanPriorDrivers(root string) []string { priorDrivers := []string{} for driver := range drivers { p := filepath.Join(root, driver) - if _, err := os.Stat(p); err == nil { + if _, err := os.Stat(p); err == nil && driver != "vfs" { priorDrivers = append(priorDrivers, driver) } }