From dba917c5b782787247b895ed3e4cb00f9b88532f Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Tue, 18 Oct 2016 12:35:58 -0700 Subject: [PATCH] Include mount command in Kubelet mounter output --- pkg/util/mount/mount_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/util/mount/mount_linux.go b/pkg/util/mount/mount_linux.go index 265915dd63a..0ea855c5397 100644 --- a/pkg/util/mount/mount_linux.go +++ b/pkg/util/mount/mount_linux.go @@ -101,15 +101,15 @@ func isBind(options []string) (bool, []string) { // doMount runs the mount command. func doMount(mountCmd string, source string, target string, fstype string, options []string) error { - glog.V(5).Infof("Mounting %s %s %s %v", source, target, fstype, options) + glog.V(5).Infof("Mounting %s %s %s %v with command: %q", source, target, fstype, options, mountCmd) mountArgs := makeMountArgs(source, target, fstype, options) command := exec.Command(mountCmd, mountArgs...) output, err := command.CombinedOutput() if err != nil { - glog.Errorf("Mount failed: %v\nMounting arguments: %s %s %s %v\nOutput: %s\n", err, source, target, fstype, options, string(output)) - return fmt.Errorf("mount failed: %v\nMounting arguments: %s %s %s %v\nOutput: %s\n", - err, source, target, fstype, options, string(output)) + glog.Errorf("Mount failed: %v\nMounting command: %s\nMounting arguments: %s %s %s %v\nOutput: %s\n", err, mountCmd, source, target, fstype, options, string(output)) + return fmt.Errorf("mount failed: %v\nMounting command: %s\nMounting arguments: %s %s %s %v\nOutput: %s\n", + err, mountCmd, source, target, fstype, options, string(output)) } return err }