Merge pull request #22608 from giuseppe/use-pause-process-dir-for-root

util: specify a not empty pause dir for root too

pkg/util/utils_supported.go

@@ -28,7 +28,7 @@ func GetRootlessConfigHomeDir() (string, error) {
 // GetRootlessPauseProcessPidPath returns the path to the file that holds the pid for
 // the pause process.
 func GetRootlessPauseProcessPidPath() (string, error) {
-	runtimeDir, err := GetRootlessRuntimeDir()
+	runtimeDir, err := homedir.GetRuntimeDir()
 	if err != nil {
 		return "", err
 	}

pkg/util/utils_test.go

@@ -764,3 +764,9 @@ func TestProcessOptions(t *testing.T) {
 		})
 	}
 }
+
+func TestGetRootlessPauseProcessPidPath(t *testing.T) {
+	dir, err := GetRootlessPauseProcessPidPath()
+	assert.NoError(t, err)
+	assert.NotEqual(t, dir, "libpod/tmp/pause.pid")
+}