docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19179 from estesp/btrfs-userns-perms 

Fix btrfs subvolume snapshot dir perms for user namespaces
This commit is contained in:
Antonio Murdaca 2016-01-08 12:13:49 +01:00
parent 611d5e4eeb 72e65e8793
commit 9e9d7dc884
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/graphdriver/btrfs/btrfs.go
View File

@ -266,6 +266,14 @@ func (d *Driver) Create(id, parent, mountLabel string) error {
} }
} }
// if we have a remapped root (user namespaces enabled), change the created snapshot
// dir ownership to match
if rootUID != 0 || rootGID != 0 {
if err := os.Chown(path.Join(subvolumes, id), rootUID, rootGID); err != nil {
return err
}
}
return label.Relabel(path.Join(subvolumes, id), mountLabel, false) return label.Relabel(path.Join(subvolumes, id), mountLabel, false)
} }