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

abi: drop check for IsRootless()
containers · Dec 18, 2023 · 26bcffd · 26bcffd
2 parents de3c02a + 1322f31
commit 26bcffd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go
@@ -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 {