containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent de3c02ab46 1322f3193b
commit 26bcffd7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/domain/infra/abi/system_linux.go
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. // do it only after podman has already re-execed and running with uid==0.
hasCapSysAdmin, err := unshare.HasCapSysAdmin() hasCapSysAdmin, err := unshare.HasCapSysAdmin()
if err != nil { if err != nil {