diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-10-19 20:24:52 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-10-30 14:41:16 -0400 |
| commit | 3e891c1b6036f9df050cad8bf3517c7d9f82876e (patch) | |
| tree | 51dc49e409355890c0c8e45a63f570e3b60cbfbe /libpod | |
| parent | ac73fd3fe5dcbf2647d589f9c9f37fe9531ed663 (diff) | |
| download | podman-3e891c1b6036f9df050cad8bf3517c7d9f82876e.tar.gz podman-3e891c1b6036f9df050cad8bf3517c7d9f82876e.tar.bz2 podman-3e891c1b6036f9df050cad8bf3517c7d9f82876e.zip | |
Wait for `mount` command to finish when mounting volume
command.Start() just starts the command. That catches some
errors, but the nasty ones - bad options and similar - happen
when the command runs. Use CombinedOutput() instead - it waits
for the command to exit, and thus catches non-0 exit of the
`mount` command (invalid options, for example).
STDERR from the `mount` command is directly used, which isn't
necessarily the best, but we can't really get much more info on
what went wrong.
Fixes #4303
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/volume_internal_linux.go | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go index 4c0332018..70eccbecb 100644 --- a/libpod/volume_internal_linux.go +++ b/libpod/volume_internal_linux.go @@ -3,8 +3,8 @@ package libpod import ( - "io/ioutil" "os/exec" + "strings" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" @@ -72,16 +72,10 @@ func (v *Volume) mount() error { mountArgs = append(mountArgs, volDevice, v.config.MountPoint) mountCmd := exec.Command(mountPath, mountArgs...) - errPipe, err := mountCmd.StderrPipe() - if err != nil { - return errors.Wrapf(err, "error getting stderr pipe for mount") - } - if err := mountCmd.Start(); err != nil { - out, err2 := ioutil.ReadAll(errPipe) - if err2 != nil { - return errors.Wrapf(err2, "error reading mount STDERR") - } - return errors.Wrapf(errors.New(string(out)), "error mounting volume %s", v.Name()) + logrus.Debugf("Running mount command: %s %s", mountPath, strings.Join(mountArgs, " ")) + if output, err := mountCmd.CombinedOutput(); err != nil { + logrus.Debugf("Mount failed with %v", err) + return errors.Wrapf(errors.Errorf(string(output)), "error mounting volume %s", v.Name()) } logrus.Debugf("Mounted volume %s", v.Name()) |