summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-10-27 09:31:32 +0200
committerMatthew Heon <matthew.heon@pm.me>2021-11-12 11:08:25 -0500
commit0519e7ef87a402a3f22193b49883cfc66812e61a (patch)
tree7800bf8e8138a44f58f129dd9f502a4cfd1c006d
parent2b85684ad1d2de0f412831e6225c176e0519bca3 (diff)
downloadpodman-0519e7ef87a402a3f22193b49883cfc66812e61a.tar.gz
podman-0519e7ef87a402a3f22193b49883cfc66812e61a.tar.bz2
podman-0519e7ef87a402a3f22193b49883cfc66812e61a.zip
utils: do not overwrite the err variable
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--utils/utils.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/utils.go b/utils/utils.go
index b08630d2f..55af41bb3 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -191,8 +191,8 @@ func moveProcessToScope(pidPath, slice, scope string) error {
func MovePauseProcessToScope(pausePidPath string) {
err := moveProcessToScope(pausePidPath, "user.slice", "podman-pause.scope")
if err != nil {
- unified, err := cgroups.IsCgroup2UnifiedMode()
- if err != nil {
+ unified, err2 := cgroups.IsCgroup2UnifiedMode()
+ if err2 != nil {
logrus.Warnf("Failed to detect if running with cgroup unified: %v", err)
}
if RunsOnSystemd() && unified {