mirror of
https://github.com/containers/podman
synced 2024-10-20 09:13:46 +00:00
Inherit rootless init_path from system libpod.conf
Signed-off-by: Lawrence Chan <element103@gmail.com>
This commit is contained in:
parent
0ede794da9
commit
8fe22d48fb
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue