summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorLawrence Chan <element103@gmail.com>2019-05-29 00:39:11 -0500
committerLawrence Chan <element103@gmail.com>2019-06-03 18:44:36 -0500
commit8fe22d48fb4d278da41afbf886e0d151ea3edfc9 (patch)
treed390f4accbf80669f6674dd5d1aa52f5ecdb78b6 /libpod/runtime.go
parent0ede794da91329ecc5a24c66924ce84023f237f9 (diff)
downloadpodman-8fe22d48fb4d278da41afbf886e0d151ea3edfc9.tar.gz
podman-8fe22d48fb4d278da41afbf886e0d151ea3edfc9.tar.bz2
podman-8fe22d48fb4d278da41afbf886e0d151ea3edfc9.zip
Inherit rootless init_path from system libpod.conf
Signed-off-by: Lawrence Chan <element103@gmail.com>
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r--libpod/runtime.go7
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
}