opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-14 02:48:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor latest c/common

Browse Source 
Includes init path changes.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-10-17 14:58:52 +02:00
parent ef2392f21c
commit 1d3ec78e00
9 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vendor/github.com/containers/common/pkg/config/config.go generated vendored
View File

@@ -149,6 +149,8 @@ type ContainersConfig struct {
Init bool `toml:"init,omitempty"`
// InitPath is the path for init to run if the Init bool is enabled
//
// Deprecated: Do not use this field directly use conf.FindInitBinary() instead.
InitPath string `toml:"init_path,omitempty"`
// IPCNS way to create a ipc namespace for the container
@@ -351,6 +353,8 @@ type EngineConfig struct {
InfraImage string `toml:"infra_image,omitempty"`
// InitPath is the path to the container-init binary.
//
// Deprecated: Do not use this field directly use conf.FindInitBinary() instead.
InitPath string `toml:"init_path,omitempty"`
// KubeGenerateType sets the Kubernetes kind/specification to generate by default
@@ -1223,3 +1227,20 @@ func ValidateImageVolumeMode(mode string) error {
return fmt.Errorf("invalid image volume mode %q required value: %s", mode, strings.Join(validImageVolumeModes, ", "))
}
// FindInitBinary will return the path to the init binary (catatonit)
func (c *Config) FindInitBinary() (string, error) {
// Sigh, for some reason we ended up with two InitPath field in containers.conf and
// both are used in podman so we have to keep supporting both to prevent regressions.
if c.Containers.InitPath != "" {
return c.Containers.InitPath, nil
}
if c.Engine.InitPath != "" {
return c.Engine.InitPath, nil
}
// keep old default working to guarantee backwards comapt
if _, err := os.Stat(DefaultInitPath); err == nil {
return DefaultInitPath, nil
}
return c.FindHelperBinary(defaultInitName, true)
}