vendor latest c/common

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

View File

@@ -30,6 +30,9 @@ const (
// _defaultImageVolumeMode is a mode to handle built-in image volumes.
_defaultImageVolumeMode = _typeBind
// defaultInitName is the default name of the init binary
defaultInitName = "catatonit"
)
var (
@@ -432,7 +435,6 @@ func defaultEngineConfig() (*EngineConfig, error) {
}
c.RuntimeSupportsNoCgroups = []string{"crun", "krun"}
c.RuntimeSupportsKVM = []string{"kata", "kata-runtime", "kata-qemu", "kata-fc", "krun"}
c.InitPath = DefaultInitPath
c.NoPivotRoot = false
c.InfraImage = DefaultInfraImage
@@ -540,11 +542,6 @@ func (c *Config) Env() []string {
return c.Containers.Env
}
// InitPath returns location where init program added to containers when users specify the --init flag.
func (c *Config) InitPath() string {
return c.Containers.InitPath
}
// IPCNS returns the default IPC Namespace configuration to run containers with.
func (c *Config) IPCNS() string {
return c.Containers.IPCNS