diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 17:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 17:28:58 +0200 |
| commit | dd7e3615ec9e4deb816c15d5c8334a2849e4845f (patch) | |
| tree | fdb7c01c2af3ae17c289188bebef2c52f0f65a78 /pkg/domain/infra | |
| parent | ae9892e23e378a6bd96884d09b886757c425ac58 (diff) | |
| parent | 817f86c73464f35d05dd876d8ede9847165303ba (diff) | |
| download | podman-dd7e3615ec9e4deb816c15d5c8334a2849e4845f.tar.gz podman-dd7e3615ec9e4deb816c15d5c8334a2849e4845f.tar.bz2 podman-dd7e3615ec9e4deb816c15d5c8334a2849e4845f.zip | |
Merge pull request #6141 from giuseppe/rootless-fix
abi: do not attempt to setup rootless if euid==0
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/system.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 692fcfa0f..24c62465f 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -86,6 +86,7 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command) } } } + return nil } pausePidPath, err := util.GetRootlessPauseProcessPidPath() |