mirror of
https://github.com/containers/podman.git
synced 2025-12-03 03:39:44 +08:00
vendor latest c/{common,image,storage}
To prepare for 5.4.0-rc1. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
9
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
9
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -14,6 +14,7 @@ import (
|
||||
"github.com/containers/common/libnetwork/types"
|
||||
"github.com/containers/common/pkg/capabilities"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/homedir"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
units "github.com/docker/go-units"
|
||||
selinux "github.com/opencontainers/selinux/go-selinux"
|
||||
@@ -740,7 +741,13 @@ func (c *Config) CheckCgroupsAndAdjustConfig() {
|
||||
|
||||
session, found := os.LookupEnv("DBUS_SESSION_BUS_ADDRESS")
|
||||
if !found {
|
||||
sessionAddr := filepath.Join(os.Getenv("XDG_RUNTIME_DIR"), "bus")
|
||||
xdgRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
|
||||
if xdgRuntimeDir == "" {
|
||||
if dir, err := homedir.GetRuntimeDir(); err == nil {
|
||||
xdgRuntimeDir = dir
|
||||
}
|
||||
}
|
||||
sessionAddr := filepath.Join(xdgRuntimeDir, "bus")
|
||||
if err := fileutils.Exists(sessionAddr); err == nil {
|
||||
sessionAddr, err = filepath.EvalSymlinks(sessionAddr)
|
||||
if err == nil {
|
||||
|
||||
1
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
1
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -46,7 +46,6 @@ var (
|
||||
"/proc/scsi",
|
||||
"/proc/timer_list",
|
||||
"/proc/timer_stats",
|
||||
"/sys/dev/block",
|
||||
"/sys/devices/virtual/powercap",
|
||||
"/sys/firmware",
|
||||
"/sys/fs/selinux",
|
||||
|
||||
Reference in New Issue
Block a user