mirror of
https://github.com/containers/podman.git
synced 2025-10-17 19:24:04 +08:00
Merge pull request #20528 from giuseppe/consolidate-xdg-runtime-code
Consolidate XDG_RUNTIME code
This commit is contained in:
@ -21,9 +21,9 @@ import (
|
||||
"github.com/containers/common/libnetwork/types"
|
||||
netUtil "github.com/containers/common/libnetwork/util"
|
||||
"github.com/containers/common/pkg/netns"
|
||||
"github.com/containers/common/pkg/util"
|
||||
"github.com/containers/podman/v4/libpod/define"
|
||||
"github.com/containers/podman/v4/pkg/rootless"
|
||||
"github.com/containers/podman/v4/pkg/util"
|
||||
"github.com/containers/podman/v4/utils"
|
||||
"github.com/containers/storage/pkg/lockfile"
|
||||
"github.com/opencontainers/runtime-spec/specs-go"
|
||||
@ -82,7 +82,7 @@ func (r *RootlessNetNS) Do(toRun func() error) error {
|
||||
return fmt.Errorf("cannot create a new mount namespace: %w", err)
|
||||
}
|
||||
|
||||
xdgRuntimeDir, err := util.GetRuntimeDir()
|
||||
xdgRuntimeDir, err := util.GetRootlessRuntimeDir()
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not get runtime directory: %w", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user