github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix binary check for nfs.go

pull/6/head
zhangxiaoyu-zidif 2017-11-24 10:55:03 +08:00
parent 842518d336
commit 3323861ed3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/volume/nfs/nfs.go
View File

@ -194,15 +194,15 @@ func (nfsMounter *nfsMounter) CanMount() error {
exec := nfsMounter.plugin.host.GetExec(nfsMounter.plugin.GetPluginName()) exec := nfsMounter.plugin.host.GetExec(nfsMounter.plugin.GetPluginName())
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
if _, err := exec.Run("/bin/ls", "/sbin/mount.nfs"); err != nil { if _, err := exec.Run("test", "-x", "/sbin/mount.nfs"); err != nil {
return fmt.Errorf("Required binary /sbin/mount.nfs is missing") return fmt.Errorf("Required binary /sbin/mount.nfs is missing")
} }
if _, err := exec.Run("/bin/ls", "/sbin/mount.nfs4"); err != nil { if _, err := exec.Run("test", "-x", "/sbin/mount.nfs4"); err != nil {
return fmt.Errorf("Required binary /sbin/mount.nfs4 is missing") return fmt.Errorf("Required binary /sbin/mount.nfs4 is missing")
} }
return nil return nil
case "darwin": case "darwin":
if _, err := exec.Run("/bin/ls", "/sbin/mount_nfs"); err != nil { if _, err := exec.Run("test", "-x", "/sbin/mount_nfs"); err != nil {
return fmt.Errorf("Required binary /sbin/mount_nfs is missing") return fmt.Errorf("Required binary /sbin/mount_nfs is missing")
} }
} }