diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-27 15:07:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 15:07:59 +0000 |
| commit | 6caf5e3b7c08cb3c5b62ed069e458910321b43b2 (patch) | |
| tree | d6a369cb220c4c914bdf9707a04069664b4461c5 /utils | |
| parent | b29dc1bde3a9b56b813a6ab99c7fea6d7859067f (diff) | |
| parent | 6b3b0a17c625bdf71b0ec8b783b288886d8e48d7 (diff) | |
| download | podman-6caf5e3b7c08cb3c5b62ed069e458910321b43b2.tar.gz podman-6caf5e3b7c08cb3c5b62ed069e458910321b43b2.tar.bz2 podman-6caf5e3b7c08cb3c5b62ed069e458910321b43b2.zip | |
Merge pull request #12111 from giuseppe/fix-warning-move-pause-process
runtime: check for pause pid existence
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/utils.go | 4 |
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 { |