From 6dbb89e56c476d41ef63ad828ebdc549ce276c85 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 25 Feb 2020 17:45:42 +0100
Subject: rootless: become root only if the pause file is specified

we need to store the pause process PID file so that it can be re-used
later.

commit e9dc2120925d9bc32b87ed3c4122aa40f7413db5 introduced this
regression.

Closes: https://github.com/containers/libpod/issues/5246

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 pkg/rootless/rootless_linux.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index f71d55776..5ddfab7ad 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -510,7 +510,7 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
 			}
 		}
 	}
-	if !foundProcess {
+	if !foundProcess && pausePidPath != "" {
 		return BecomeRootInUserNS(pausePidPath)
 	}
 	if lastErr != nil {
-- 
cgit v1.2.3-54-g00ecf