Merge pull request #3256 from llchan/rootless-init-path

Inherit rootless init_path from system libpod.conf

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
 			}