github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16033 from rootfs/mount-verbose

Browse Source 
mount returns more verbose message upon error
This commit is contained in:
Jeff Lowdermilk
2015-10-21 15:32:02 -07:00
parent 236193a26d 3b14135cad
commit 432a96c8bb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/mount/mount_linux.go
View File

@@ -99,7 +99,7 @@ func doMount(source string, target string, fstype string, options []string) erro
command := exec.Command("mount", mountArgs...) command := exec.Command("mount", mountArgs...)
output, err := command.CombinedOutput() output, err := command.CombinedOutput()
if err != nil { if err != nil {
glog.Errorf("Mount failed: %v\nMounting arguments: %s %s %s %v\nOutput: %s\n", return fmt.Errorf("Mount failed: %v\nMounting arguments: %s %s %s %v\nOutput: %s\n",
err, source, target, fstype, options, string(output)) err, source, target, fstype, options, string(output))
} }
return err return err
@@ -130,8 +130,7 @@ func (mounter *Mounter) Unmount(target string) error {
command := exec.Command("umount", target) command := exec.Command("umount", target)
output, err := command.CombinedOutput() output, err := command.CombinedOutput()
if err != nil { if err != nil {
glog.Errorf("Unmount failed: %v\nUnmounting arguments: %s\nOutput: %s\n", err, target, string(output)) return fmt.Errorf("Unmount failed: %v\nUnmounting arguments: %s\nOutput: %s\n", err, target, string(output))
return err
} }
return nil return nil
} }