containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inherit rootless init_path from system libpod.conf 

Signed-off-by: Lawrence Chan <element103@gmail.com>
This commit is contained in:
Lawrence Chan 2019-05-29 00:39:11 -05:00
parent 0ede794da9
commit 8fe22d48fb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/runtime.go
View File

@ -250,6 +250,7 @@ type runtimeConfiguredFrom struct {
volPathSet bool volPathSet bool
conmonPath bool conmonPath bool
conmonEnvVars bool conmonEnvVars bool
initPath bool
ociRuntimes bool ociRuntimes bool
runtimePath bool runtimePath bool
cniPluginDir bool cniPluginDir bool
@ -475,6 +476,9 @@ func newRuntimeFromConfig(ctx context.Context, userConfigPath string, options ..
if tmpConfig.ConmonEnvVars != nil { if tmpConfig.ConmonEnvVars != nil {
runtime.configuredFrom.conmonEnvVars = true runtime.configuredFrom.conmonEnvVars = true
} }
if tmpConfig.InitPath != "" {
runtime.configuredFrom.initPath = true
}
if tmpConfig.OCIRuntimes != nil { if tmpConfig.OCIRuntimes != nil {
runtime.configuredFrom.ociRuntimes = true runtime.configuredFrom.ociRuntimes = true
} }
@ -512,6 +516,9 @@ func newRuntimeFromConfig(ctx context.Context, userConfigPath string, options ..
if !runtime.configuredFrom.conmonEnvVars { if !runtime.configuredFrom.conmonEnvVars {
runtime.config.ConmonEnvVars = tmpConfig.ConmonEnvVars runtime.config.ConmonEnvVars = tmpConfig.ConmonEnvVars
} }
if !runtime.configuredFrom.initPath {
runtime.config.InitPath = tmpConfig.InitPath
}
if !runtime.configuredFrom.ociRuntimes { if !runtime.configuredFrom.ociRuntimes {
runtime.config.OCIRuntimes = tmpConfig.OCIRuntimes runtime.config.OCIRuntimes = tmpConfig.OCIRuntimes
} }