github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

nfs.go: cleancode err

Browse Source
This commit is contained in:
zhangxiaoyu-zidif 2017-05-06 19:06:27 +08:00
parent 79a2e359cd
commit aec46961e9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,19 +195,15 @@ func (nfsMounter *nfsMounter) CanMount() error {
exe := exec.New() exe := exec.New()
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
_, err1 := exe.Command("/bin/ls", "/sbin/mount.nfs").CombinedOutput() if _, err := exe.Command("/bin/ls", "/sbin/mount.nfs").CombinedOutput(); err != nil {
_, err2 := exe.Command("/bin/ls", "/sbin/mount.nfs4").CombinedOutput()
if err1 != nil {
return fmt.Errorf("Required binary /sbin/mount.nfs is missing") return fmt.Errorf("Required binary /sbin/mount.nfs is missing")
} }
if err2 != nil { if _, err := exe.Command("/bin/ls", "/sbin/mount.nfs4").CombinedOutput(); 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":
_, err := exe.Command("/bin/ls", "/sbin/mount_nfs").CombinedOutput() if _, err := exe.Command("/bin/ls", "/sbin/mount_nfs").CombinedOutput(); err != nil {
if err != nil {
return fmt.Errorf("Required binary /sbin/mount_nfs is missing") return fmt.Errorf("Required binary /sbin/mount_nfs is missing")
} }
} }