diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_commit.go | 3 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 17586bfad..8dfeee9b8 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -19,7 +19,7 @@ import ( // ContainerCommitOptions is a struct used to commit a container to an image // It uses buildah's CommitOptions as a base. Long-term we might wish to // add these to the buildah struct once buildah is more integrated with -//libpod +// libpod type ContainerCommitOptions struct { buildah.CommitOptions Pause bool @@ -177,6 +177,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai return nil, errors.Errorf("invalid env variable %q: not defined in your environment", name) } } else { + name = change[0] val = strings.Join(change[1:], " ") } if !isEnvCleared { // Multiple values are valid, only clear once. diff --git a/libpod/runtime.go b/libpod/runtime.go index 28958e932..bb6bfbfcc 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -293,6 +293,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) { "/sbin/runc", "/bin/runc", "/usr/lib/cri-o-runc/sbin/runc", + "/run/current-system/sw/bin/runc", }, }, ConmonPath: []string{ @@ -302,6 +303,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) { "/usr/sbin/conmon", "/usr/local/bin/conmon", "/usr/local/sbin/conmon", + "/run/current-system/sw/bin/conmon", }, ConmonEnvVars: []string{ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", |