mirror of
https://github.com/containers/podman.git
synced 2025-11-13 09:38:05 +08:00
Switch eventlogger to journald by default
[NO TESTS NEEDED] Since we are just testing the default. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
committed by
Nalin Dahyabhai
parent
d1137664fe
commit
6b06e9b77c
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -274,6 +274,9 @@ type EngineConfig struct {
|
||||
// MachineEnabled indicates if Podman is running in a podman-machine VM
|
||||
MachineEnabled bool `toml:"machine_enabled,omitempty"`
|
||||
|
||||
// MachineImage is the image used when creating a podman-machine VM
|
||||
MachineImage string `toml:"machine_image,omitempty"`
|
||||
|
||||
// MultiImageArchive - if true, the container engine allows for storing
|
||||
// archives (e.g., of the docker-archive transport) with multiple
|
||||
// images. By default, Podman creates single-image archives.
|
||||
@@ -691,8 +694,8 @@ func (c *Config) Validate() error {
|
||||
}
|
||||
|
||||
func (c *EngineConfig) findRuntime() string {
|
||||
// Search for crun first followed by runc and kata
|
||||
for _, name := range []string{"crun", "runc", "kata"} {
|
||||
// Search for crun first followed by runc, kata, runsc
|
||||
for _, name := range []string{"crun", "runc", "kata", "runsc"} {
|
||||
for _, v := range c.OCIRuntimes[name] {
|
||||
if _, err := os.Stat(v); err == nil {
|
||||
return name
|
||||
|
||||
Reference in New Issue
Block a user