mirror of
https://github.com/containers/podman.git
synced 2025-12-01 18:49:18 +08:00
Update vendor containers/(common,storage,buildah,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
10
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
10
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -364,10 +364,19 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
"/sbin/runsc",
|
||||
"/run/current-system/sw/bin/runsc",
|
||||
},
|
||||
"youki": {
|
||||
"/usr/local/bin/youki",
|
||||
"/usr/bin/youki",
|
||||
"/bin/youki",
|
||||
"/run/current-system/sw/bin/youki",
|
||||
},
|
||||
"krun": {
|
||||
"/usr/bin/krun",
|
||||
"/usr/local/bin/krun",
|
||||
},
|
||||
"ocijail": {
|
||||
"/usr/local/bin/ocijail",
|
||||
},
|
||||
}
|
||||
// Needs to be called after populating c.OCIRuntimes.
|
||||
c.OCIRuntime = c.findRuntime()
|
||||
@@ -401,6 +410,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
"runc",
|
||||
"kata",
|
||||
"runsc",
|
||||
"youki",
|
||||
"krun",
|
||||
}
|
||||
c.RuntimeSupportsNoCgroups = []string{"crun", "krun"}
|
||||
|
||||
Reference in New Issue
Block a user