From b0efd8dda5c29885d441bed21cac680f5a3420dc Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 26 Jun 2017 17:29:24 -0400 Subject: [PATCH 1/2] Do not error on relabel when relabel not supported Signed-off-by: Brian Goff (cherry picked from commit ebfdfc5768b74e0a52875cf76a0576bfcd66445c) Signed-off-by: Andrew Hsu --- components/engine/volume/volume.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/volume/volume.go b/components/engine/volume/volume.go index 774d9f78c1..a3034292ee 100644 --- a/components/engine/volume/volume.go +++ b/components/engine/volume/volume.go @@ -153,6 +153,10 @@ func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int, checkFun fun if err == nil { if label.RelabelNeeded(m.Mode) { if err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil { + if err == syscall.ENOTSUP { + err = nil + return + } path = "" err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source) return From 4ff004bf0d4009b12ba4eb7f567e9b7aee052148 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 26 Jun 2017 17:29:24 -0400 Subject: [PATCH 2/2] Do not error on relabel when relabel not supported Signed-off-by: Brian Goff (cherry picked from commit ebfdfc5768b74e0a52875cf76a0576bfcd66445c) Signed-off-by: Andrew Hsu --- .../cli/vendor/github.com/docker/docker/volume/volume.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/cli/vendor/github.com/docker/docker/volume/volume.go b/components/cli/vendor/github.com/docker/docker/volume/volume.go index 5135605281..2a1e1ee255 100644 --- a/components/cli/vendor/github.com/docker/docker/volume/volume.go +++ b/components/cli/vendor/github.com/docker/docker/volume/volume.go @@ -151,6 +151,10 @@ func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int) (path string if err == nil { if label.RelabelNeeded(m.Mode) { if err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil { + if err == syscall.ENOTSUP { + err = nil + return + } path = "" err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source) return