mirror of
https://github.com/containers/podman.git
synced 2025-12-09 07:09:03 +08:00
vendor latest c/common
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
//go:build (freebsd || netbsd || openbsd)
|
||||
|
||||
package config
|
||||
|
||||
const (
|
||||
2
vendor/github.com/containers/common/pkg/config/config_windows.go
generated
vendored
2
vendor/github.com/containers/common/pkg/config/config_windows.go
generated
vendored
@@ -5,7 +5,7 @@ import "os"
|
||||
const (
|
||||
// _configPath is the path to the containers/containers.conf
|
||||
// inside a given config directory.
|
||||
_configPath = "containers\\containers.conf"
|
||||
_configPath = "\\containers\\containers.conf"
|
||||
|
||||
// DefaultContainersConfig holds the default containers config path
|
||||
DefaultContainersConfig = ""
|
||||
|
||||
10
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
10
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@@ -350,9 +350,9 @@ default_sysctls = [
|
||||
|
||||
# The firewall driver to be used by netavark.
|
||||
# The default is empty which means netavark will pick one accordingly. Current supported
|
||||
# drivers are "iptables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
|
||||
# experimental at the moment and not recommend outside of testing). In the future we are
|
||||
# planning to add support for a "nftables" driver.
|
||||
# drivers are "iptables", "nftables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
|
||||
# experimental at the moment and not recommend outside of testing).
|
||||
#
|
||||
#firewall_driver = ""
|
||||
|
||||
|
||||
@@ -890,10 +890,10 @@ default_sysctls = [
|
||||
[podmansh]
|
||||
# Shell to spawn in container. Default: /bin/sh.
|
||||
#shell = "/bin/sh"
|
||||
#
|
||||
#
|
||||
# Name of the container the podmansh user should join.
|
||||
#container = "podmansh"
|
||||
#
|
||||
#
|
||||
# Default timeout in seconds for podmansh logins.
|
||||
# Favored over the deprecated "podmansh_timeout" field.
|
||||
#timeout = 30
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
//go:build (freebsd || netbsd || openbsd)
|
||||
|
||||
package config
|
||||
|
||||
// DefaultInitPath is the default path to the container-init binary.
|
||||
2
vendor/github.com/containers/common/pkg/config/default_common.go
generated
vendored
2
vendor/github.com/containers/common/pkg/config/default_common.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
//go:build !freebsd
|
||||
//go:build !freebsd && !netbsd
|
||||
|
||||
package config
|
||||
|
||||
|
||||
Reference in New Issue
Block a user