diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2022-07-12 11:47:30 +0200 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-07-26 13:08:11 -0400 |
| commit | 7b4ebfa657d605d0767be7ccb2607c923ce4311f (patch) | |
| tree | 7326ed01c4c543029412e11775a30ccdbc3ab7db /pkg/domain/infra/abi | |
| parent | 3b37095b2b91f6e67db6195af685ce88e7a2519a (diff) | |
| download | podman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.tar.gz podman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.tar.bz2 podman-7b4ebfa657d605d0767be7ccb2607c923ce4311f.zip | |
podman: always call into SetupRootless
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/system.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 0faae01c8..eed80dd79 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -67,6 +67,10 @@ func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { } func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool) error { + 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 { |