opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 23:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

util: specify a not empty pause dir for root too

Browse Source 
commit b3014c1c69d5870104aa45f7caae7af041094171 changed
GetRootlessRuntimeDir() to return an empty string for root, so that
its value is not exported as XDG_RUNTIME_DIR, and other programs like
crun can use a better default.

Now GetRootlessPauseProcessPidPath() uses homedir.GetRuntimeDir().
The homedir.GetRuntimeDir() function returns a value also when running
as root so it can be used inside a nested Podman.

Closes: https://github.com/containers/podman/issues/22327

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2024-05-06 10:34:48 +02:00
parent 6ec2c0b43b
commit 419efb9eb5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/utils_supported.go
View File

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

6
pkg/util/utils_test.go
View File

@ -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")
}