mirror of
https://github.com/containers/podman.git
synced 2025-10-16 18:53:19 +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
10
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
10
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -105,8 +105,6 @@ const (
|
||||
DefaultApparmorProfile = apparmor.Profile
|
||||
// SystemdCgroupsManager represents systemd native cgroup manager
|
||||
SystemdCgroupsManager = "systemd"
|
||||
// DefaultLogDriver is the default type of log files
|
||||
DefaultLogDriver = "k8s-file"
|
||||
// DefaultLogSizeMax is the default value for the maximum log size
|
||||
// allowed for a container. Negative values mean that no limit is imposed.
|
||||
DefaultLogSizeMax = -1
|
||||
@ -339,6 +337,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
// constants.
|
||||
c.LockType = "shm"
|
||||
c.MachineEnabled = false
|
||||
c.MachineImage = "testing"
|
||||
|
||||
c.ChownCopiedFiles = true
|
||||
|
||||
@ -549,6 +548,7 @@ func (c *Config) LogDriver() string {
|
||||
return c.Containers.LogDriver
|
||||
}
|
||||
|
||||
// MachineEnabled returns if podman is running inside a VM or not
|
||||
func (c *Config) MachineEnabled() bool {
|
||||
return c.Engine.MachineEnabled
|
||||
}
|
||||
@ -558,3 +558,9 @@ func (c *Config) MachineEnabled() bool {
|
||||
func (c *Config) RootlessNetworking() string {
|
||||
return c.Containers.RootlessNetworking
|
||||
}
|
||||
|
||||
// MachineImage returns the image to be
|
||||
// used when creating a podman-machine VM
|
||||
func (c *Config) MachineImage() string {
|
||||
return c.Engine.MachineImage
|
||||
}
|
||||
|
Reference in New Issue
Block a user