Merge pull request #19 from mjg59/selinux-fix-overlayfs

overlayfs: Don't attempt to relabel the merged directory
coreos · Jun 13, 2016 · 1f8f545 · 1f8f545
2 parents 7e81653 + b1c07e3
commit 1f8f545
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go
@@ -370,9 +370,6 @@ func (d *Driver) Get(id string, mountLabel string) (string, error) {
 	if err = label.Relabel(workDir, mountLabel, false); err != nil {
 		return "", fmt.Errorf("Error relabeling work directory: %v", err)
 	}
-	if err = label.Relabel(mergedDir, mountLabel, false); err != nil {
-		return "", fmt.Errorf("Error relabeling merged directory: %v", err)
-	}
 
 	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir)
 	if err := syscall.Mount("overlay", mergedDir, "overlay", 0, label.FormatMountLabel(opts, mountLabel)); err != nil {