Merge pull request containers#22608 from giuseppe/use-pause-process-d…

…ir-for-root util: specify a not empty pause dir for root too
edsantiago · May 6, 2024 · 07d8b32 · 07d8b32
2 parents efcb1f8 + 419efb9
commit 07d8b32
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/util/utils_supported.go b/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
  }

diff --git a/pkg/util/utils_test.go b/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")
+}