Merge pull request #16152 from chlunde/devmapper-mount-flags

Use pkg/mount to support more flags in dm.mountopt
This commit is contained in:
Michael Crosby 2015-10-08 16:02:50 -07:00
Родитель bccf5c756b 9a64f2bbb3
Коммит 6d9a84bcd0
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -21,6 +21,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/devicemapper"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/units"
"github.com/opencontainers/runc/libcontainer/label"
@ -2004,7 +2005,7 @@ func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error {
options = joinMountOptions(options, devices.mountOptions)
options = joinMountOptions(options, label.FormatMountLabel("", mountLabel))
if err := syscall.Mount(info.DevName(), path, fstype, syscall.MS_MGC_VAL, options); err != nil {
if err := mount.Mount(info.DevName(), path, fstype, options); err != nil {
return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), path, err)
}