diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-02-26 11:20:22 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-02-26 11:40:34 +0100 |
| commit | 446d333783e2ea3545eec35eb0cc4e3b3a168964 (patch) | |
| tree | 4adc03cf86f1d2230b24adaf3e99e5246597c988 | |
| parent | 05450f3162347b2d2b2f61559a6b8261f7dffec9 (diff) | |
| download | podman-446d333783e2ea3545eec35eb0cc4e3b3a168964.tar.gz podman-446d333783e2ea3545eec35eb0cc4e3b3a168964.tar.bz2 podman-446d333783e2ea3545eec35eb0cc4e3b3a168964.zip | |
oci: improve error message when the OCI runtime is not found
We were previously returning the not so nice error directly from
conmon.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | libpod/runtime.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 94dbf37dd..52f4523ba 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -526,6 +526,16 @@ func makeRuntime(runtime *Runtime) (err error) { if runtime.config.OCIRuntime != "" && runtime.config.OCIRuntime[0] == '/' { foundRuntime = true runtime.ociRuntimePath = OCIRuntimePath{Name: filepath.Base(runtime.config.OCIRuntime), Paths: []string{runtime.config.OCIRuntime}} + stat, err := os.Stat(runtime.config.OCIRuntime) + if err != nil { + if os.IsNotExist(err) { + return errors.Wrapf(err, "the specified OCI runtime %s does not exist", runtime.config.OCIRuntime) + } + return errors.Wrapf(err, "cannot stat the OCI runtime path %s", runtime.config.OCIRuntime) + } + if !stat.Mode().IsRegular() { + return fmt.Errorf("the specified OCI runtime %s is not a valid file", runtime.config.OCIRuntime) + } } else { // If not, look it up in the configuration. paths := runtime.config.OCIRuntimes[runtime.config.OCIRuntime] |