summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-07-27 12:34:07 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2021-07-27 14:26:22 +0200
commita0313ef92b1daaaa34778c552c8b099d7da420dd (patch)
tree65844cdfbf8dac1600946e1762700e26c221aa4b /pkg/domain/infra
parentd7b2f03f8a5d0e3789ac185ea03989463168fb76 (diff)
downloadpodman-a0313ef92b1daaaa34778c552c8b099d7da420dd.tar.gz
podman-a0313ef92b1daaaa34778c552c8b099d7da420dd.tar.bz2
podman-a0313ef92b1daaaa34778c552c8b099d7da420dd.zip
rootless: do not overwrite err variable
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/system.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 155cda21d..c603bf246 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -119,8 +119,8 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command)
became, ret, err = rootless.TryJoinFromFilePaths(pausePidPath, true, paths)
if err := movePauseProcessToScope(ic.Libpod); err != nil {
- conf, err := ic.Config(context.Background())
- if err != nil {
+ conf, err2 := ic.Config(context.Background())
+ if err2 != nil {
return err
}
if conf.Engine.CgroupManager == config.SystemdCgroupsManager {