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

Merge pull request #13865 from Mic92/zfs-selinux 

zfs: correctly apply selinux context
This commit is contained in:
Jessie Frazelle 2015-06-11 12:42:06 -07:00
parent e3821feb13 19c31a703f
commit cada9b54b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import (
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
"github.com/docker/libcontainer/label"
zfs "github.com/mistifyio/go-zfs" zfs "github.com/mistifyio/go-zfs"
) )
@ -268,14 +269,15 @@ func (d *Driver) Remove(id string) error {
func (d *Driver) Get(id, mountLabel string) (string, error) { func (d *Driver) Get(id, mountLabel string) (string, error) {
mountpoint := d.MountPath(id) mountpoint := d.MountPath(id)
filesystem := d.ZfsPath(id) filesystem := d.ZfsPath(id)
log.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, mountLabel) options := label.FormatMountLabel("", mountLabel)
log.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, options)
// Create the target directories if they don't exist // Create the target directories if they don't exist
if err := os.MkdirAll(mountpoint, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(mountpoint, 0755); err != nil && !os.IsExist(err) {
return "", err return "", err
} }
err := mount.Mount(filesystem, mountpoint, "zfs", mountLabel) err := mount.Mount(filesystem, mountpoint, "zfs", options)
if 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)
} }