From 194d14ca2fd78e0e7f390adafd7774b6e848bb25 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 12 Jan 2022 21:15:30 +0100
Subject: libpod: fix check for systemd session

move the check after the cgroup manager is set, so to correctly detect
--cgroup-manager=cgroupfs and do not raise a warning about dbus not
being present.

Closes: https://github.com/containers/podman/issues/12802

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 libpod/runtime.go            | 3 ++-
 test/system/250-systemd.bats | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 9794b3605..3297b1ddd 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -170,7 +170,6 @@ func NewRuntime(ctx context.Context, options ...RuntimeOption) (*Runtime, error)
 	if err != nil {
 		return nil, err
 	}
-	conf.CheckCgroupsAndAdjustConfig()
 	return newRuntimeFromConfig(ctx, conf, options...)
 }
 
@@ -228,6 +227,8 @@ func newRuntimeFromConfig(ctx context.Context, conf *config.Config, options ...R
 		return nil, err
 	}
 
+	runtime.config.CheckCgroupsAndAdjustConfig()
+
 	return runtime, nil
 }
 
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats
index c49727cc9..c47679904 100644
--- a/test/system/250-systemd.bats
+++ b/test/system/250-systemd.bats
@@ -276,4 +276,9 @@ LISTEN_FDNAMES=listen_fdnames" | sort)
     is "$output" ".*--template cannot be set" "Error message should be '--template requires --new'"
 }
 
+@test "podman --cgroup=cgroupfs doesn't show systemd warning" {
+    DBUS_SESSION_BUS_ADDRESS= run_podman --log-level warning --cgroup-manager=cgroupfs info -f ''
+    is "$output" "" "output should be empty"
+}
+
 # vim: filetype=sh
-- 
cgit v1.2.3-54-g00ecf