vendor latest c/common

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-06-04 17:49:02 +02:00
parent 7c5c60bc39
commit 15a4e1dffd
14 changed files with 63 additions and 42 deletions

View File

@@ -1,3 +1,5 @@
//go:build (freebsd || netbsd || openbsd)
package config
const (

View File

@@ -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 = ""

View File

@@ -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

View File

@@ -1,3 +1,5 @@
//go:build (freebsd || netbsd || openbsd)
package config
// DefaultInitPath is the default path to the container-init binary.

View File

@@ -1,4 +1,4 @@
//go:build !freebsd
//go:build !freebsd && !netbsd
package config