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

Merge pull request #20045 from estesp/zfs-userns-permissions-fix 

Fix ZFS permissions bug with user namespaces
This commit is contained in:
David Calavera 2016-02-05 15:32:43 -08:00
parent fa8f4aa539 aef0995b02
commit a93cb2b856
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,10 +308,14 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
return "", err return "", err
} }
err = mount.Mount(filesystem, mountpoint, "zfs", options) if err := mount.Mount(filesystem, mountpoint, "zfs", options); err != nil {
if err != nil {
return "", fmt.Errorf("error creating zfs mount of %s to %s: %v", filesystem, mountpoint, err) return "", fmt.Errorf("error creating zfs mount of %s to %s: %v", filesystem, mountpoint, err)
} }
// this could be our first mount after creation of the filesystem, and the root dir may still have root
// permissions instead of the remapped root uid:gid (if user namespaces are enabled):
if err := os.Chown(mountpoint, rootUID, rootGID); err != nil {
return "", fmt.Errorf("error modifying zfs mountpoint (%s) directory ownership: %v", mountpoint, err)
}
return mountpoint, nil return mountpoint, nil
} }