opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7339 from giuseppe/change-systemd-detection

Browse Source 
abi: fix detection for systemd
This commit is contained in:
OpenShift Merge Robot
2020-08-18 20:49:45 +02:00
committed by GitHub
parent 13b307e7cc b3f5c93ecc
commit 7995f85f75
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/domain/infra/abi/system.go
View File

@ -70,8 +70,13 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command)
if err != nil { if err != nil {
return err return err
} }
initCommand, err := ioutil.ReadFile("/proc/1/comm")
// On errors, default to systemd
runsUnderSystemd := err != nil || string(initCommand) == "systemd"
unitName := fmt.Sprintf("podman-%d.scope", os.Getpid()) unitName := fmt.Sprintf("podman-%d.scope", os.Getpid())
if conf.Engine.CgroupManager == config.SystemdCgroupsManager { if runsUnderSystemd || conf.Engine.CgroupManager == config.SystemdCgroupsManager {
if err := utils.RunUnderSystemdScope(os.Getpid(), "user.slice", unitName); err != nil { if err := utils.RunUnderSystemdScope(os.Getpid(), "user.slice", unitName); err != nil {
logrus.Warnf("Failed to add podman to systemd sandbox cgroup: %v", err) logrus.Warnf("Failed to add podman to systemd sandbox cgroup: %v", err)
} }