opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 10:10:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22154 from dfr/cgroups-unsupported

Browse Source 
libpod: don't warn about cgroupsv1 on FreeBSD
This commit is contained in:
openshift-merge-bot[bot]
2024-03-26 12:10:54 +00:00
committed by GitHub
parent e64d81481d 80e2bc6966
commit fdc4901e7d
3 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libpod/runtime.go
View File

@ -15,8 +15,6 @@ import (
"syscall"
"time"
"golang.org/x/sys/unix"
"github.com/containers/buildah/pkg/parse"
"github.com/containers/common/libimage"
"github.com/containers/common/libnetwork/network"
@ -392,32 +390,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
runtime.mergeDBConfig(dbConfig)
unified, _ := cgroups.IsCgroup2UnifiedMode()
// DELETE ON RHEL9
if !unified {
_, ok := os.LookupEnv("PODMAN_IGNORE_CGROUPSV1_WARNING")
if !ok {
logrus.Warn("Using cgroups-v1 which is deprecated in favor of cgroups-v2 with Podman v5 and will be removed in a future version. Set environment variable `PODMAN_IGNORE_CGROUPSV1_WARNING` to hide this warning.")
}
}
// DELETE ON RHEL9
if unified && rootless.IsRootless() && !systemd.IsSystemdSessionValid(rootless.GetRootlessUID()) {
// If user is rootless and XDG_RUNTIME_DIR is found, podman will not proceed with /tmp directory
// it will try to use existing XDG_RUNTIME_DIR
// if current user has no write access to XDG_RUNTIME_DIR we will fail later
if err := unix.Access(runtime.storageConfig.RunRoot, unix.W_OK); err != nil {
msg := fmt.Sprintf("RunRoot is pointing to a path (%s) which is not writable. Most likely podman will fail.", runtime.storageConfig.RunRoot)
if errors.Is(err, os.ErrNotExist) {
// if dir does not exist, try to create it
if err := os.MkdirAll(runtime.storageConfig.RunRoot, 0700); err != nil {
logrus.Warn(msg)
}
} else {
logrus.Warnf("%s: %v", msg, err)
}
}
}
checkCgroups2UnifiedMode(runtime)
logrus.Debugf("Using graph driver %s", runtime.storageConfig.GraphDriverName)
logrus.Debugf("Using graph root %s", runtime.storageConfig.GraphRoot)

6
libpod/runtime_freebsd.go Normal file
View File

@ -0,0 +1,6 @@
//go:build !remote
package libpod
func checkCgroups2UnifiedMode(runtime *Runtime) {
}

45
libpod/runtime_linux.go Normal file
View File

@ -0,0 +1,45 @@
//go:build !remote
package libpod
import (
"errors"
"fmt"
"os"
"golang.org/x/sys/unix"
"github.com/containers/common/pkg/cgroups"
"github.com/containers/podman/v5/pkg/rootless"
"github.com/containers/podman/v5/pkg/systemd"
"github.com/sirupsen/logrus"
)
func checkCgroups2UnifiedMode(runtime *Runtime) {
unified, _ := cgroups.IsCgroup2UnifiedMode()
// DELETE ON RHEL9
if !unified {
_, ok := os.LookupEnv("PODMAN_IGNORE_CGROUPSV1_WARNING")
if !ok {
logrus.Warn("Using cgroups-v1 which is deprecated in favor of cgroups-v2 with Podman v5 and will be removed in a future version. Set environment variable `PODMAN_IGNORE_CGROUPSV1_WARNING` to hide this warning.")
}
}
// DELETE ON RHEL9
if unified && rootless.IsRootless() && !systemd.IsSystemdSessionValid(rootless.GetRootlessUID()) {
// If user is rootless and XDG_RUNTIME_DIR is found, podman will not proceed with /tmp directory
// it will try to use existing XDG_RUNTIME_DIR
// if current user has no write access to XDG_RUNTIME_DIR we will fail later
if err := unix.Access(runtime.storageConfig.RunRoot, unix.W_OK); err != nil {
msg := fmt.Sprintf("RunRoot is pointing to a path (%s) which is not writable. Most likely podman will fail.", runtime.storageConfig.RunRoot)
if errors.Is(err, os.ErrNotExist) {
// if dir does not exist, try to create it
if err := os.MkdirAll(runtime.storageConfig.RunRoot, 0700); err != nil {
logrus.Warn(msg)
}
} else {
logrus.Warnf("%s: %v", msg, err)
}
}
}
}