Merge pull request #21017 from giuseppe/fix-podman-info-twice

abi: drop check for IsRootless()
This commit is contained in:
openshift-merge-bot[bot]
2023-12-18 20:32:59 +00:00
committed by GitHub

View File

@@ -30,10 +30,6 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool)
}
}
if !rootless.IsRootless() {
return nil
}
// do it only after podman has already re-execed and running with uid==0.
hasCapSysAdmin, err := unshare.HasCapSysAdmin()
if err != nil {