diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-05 23:13:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 23:13:07 +0200 |
| commit | 6d285b879c3fa252545b15a3dea816426ba2c610 (patch) | |
| tree | 7398c97c899e3ad9f6ee6f4b6b52ae0e74baa4eb | |
| parent | b1c9cb712db0e5cdc9f3b5f188c5c0083ab00fc6 (diff) | |
| parent | 8fe22d48fb4d278da41afbf886e0d151ea3edfc9 (diff) | |
| download | podman-6d285b879c3fa252545b15a3dea816426ba2c610.tar.gz podman-6d285b879c3fa252545b15a3dea816426ba2c610.tar.bz2 podman-6d285b879c3fa252545b15a3dea816426ba2c610.zip | |
Merge pull request #3256 from llchan/rootless-init-path
Inherit rootless init_path from system libpod.conf
| -rw-r--r-- | libpod/runtime.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 1f8dd98b4..098607b63 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -250,6 +250,7 @@ type runtimeConfiguredFrom struct { volPathSet bool conmonPath bool conmonEnvVars bool + initPath bool ociRuntimes bool runtimePath bool cniPluginDir bool @@ -475,6 +476,9 @@ func newRuntimeFromConfig(ctx context.Context, userConfigPath string, options .. if tmpConfig.ConmonEnvVars != nil { runtime.configuredFrom.conmonEnvVars = true } + if tmpConfig.InitPath != "" { + runtime.configuredFrom.initPath = true + } if tmpConfig.OCIRuntimes != nil { runtime.configuredFrom.ociRuntimes = true } @@ -512,6 +516,9 @@ func newRuntimeFromConfig(ctx context.Context, userConfigPath string, options .. if !runtime.configuredFrom.conmonEnvVars { runtime.config.ConmonEnvVars = tmpConfig.ConmonEnvVars } + if !runtime.configuredFrom.initPath { + runtime.config.InitPath = tmpConfig.InitPath + } if !runtime.configuredFrom.ociRuntimes { runtime.config.OCIRuntimes = tmpConfig.OCIRuntimes } |