toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92 from andrewhsu/fix-relabel

Browse Source 
[17.06] Do not error on relabel when relabel not supported
This commit is contained in:
Andrew Hsu
2017-07-11 21:29:47 -07:00
committed by GitHub
parent b5f090a4fe 4ff004bf0d
commit abfc72adff
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/cli/vendor/github.com/docker/docker/volume/volume.go
Generated Vendored
+4
View File
@@ -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
components/engine/volume/volume.go
+4
View File
@@ -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