abi: drop check for IsRootless()

giuseppe · giuseppe · commit c6d198e443e7 · 2024-01-30T15:59:31.000+01:00
it is the wrong check to do here since we need to setup the user namespace even in the case we are running as root without capabilities. [NO NEW TESTS NEEDED] this happens in nested podman Closes: containers#20908 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> (cherry picked from commit 1322f31)
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
@@ -78,10 +78,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 {

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,6 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool)`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- if !rootless.IsRootless() {`
`82`		`- return nil`
`83`		`- }`
`84`		`-`
`85`	`81`	`// do it only after podman has already re-execed and running with uid==0.`
`86`	`82`	`hasCapSysAdmin, err := unshare.HasCapSysAdmin()`
`87`	`83`	`if err != nil {`