Merge pull request #5664 from calfonso/nfs_mount_plugin

Addresses cross compile for syscall.Unmount by delegating to Mount.
This commit is contained in:
Tim Hockin
2015-03-19 16:19:01 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -18,7 +18,6 @@ package nfs
import (
"os/exec"
"syscall"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount"
"github.com/golang/glog"
@@ -59,7 +58,8 @@ func (mounter *nfsMounter) Mount(server string, exportDir string, mountDir strin
}
func (mounter *nfsMounter) Unmount(target string) error {
return syscall.Unmount(target, 0)
unmounter := mount.New()
return unmounter.Unmount(target, 0)
}
func (mounter *nfsMounter) List() ([]mount.MountPoint, error) {