opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21172 from cgwalters/machine-use-datadir

Browse Source 
machine: use GlobalDataDir helper
This commit is contained in:
openshift-merge-bot[bot]
2024-01-05 17:52:15 +00:00
committed by GitHub
parent 0a316fa7d4 06064150ea
commit 8b6d2a6d93
8 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/utils.go
View File

@ -25,7 +25,6 @@ import (
"github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/pkg/signal"
"github.com/containers/storage/pkg/directory"
"github.com/containers/storage/pkg/homedir"
"github.com/containers/storage/pkg/idtools"
stypes "github.com/containers/storage/types"
securejoin "github.com/cyphar/filepath-securejoin"
@ -1166,10 +1165,6 @@ func ExitCode(err error) int {
return 126
}
func GetIdentityPath(name string) string {
return filepath.Join(homedir.Get(), ".local", "share", "containers", "podman", "machine", name)
}
func Tmpdir() string {
tmpdir := os.Getenv("TMPDIR")
if tmpdir == "" {