utils: use GetRuntimeDir() from c/storage

Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Nov 7, 2023 · 07cbc57 · 07cbc57
1 parent 41f6e3f
commit 07cbc57
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 108 deletions.
diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -13,7 +13,6 @@ import (
  nettypes "github.com/containers/common/libnetwork/types"
  "github.com/containers/common/pkg/apparmor"
  "github.com/containers/common/pkg/cgroupv2"
- "github.com/containers/common/pkg/util"
  "github.com/containers/storage/pkg/homedir"
  "github.com/containers/storage/pkg/unshare"
  "github.com/containers/storage/types"
@@ -484,7 +483,7 @@ func defaultTmpDir() (string, error) {
  return getLibpodTmpDir(), nil
  }
 
- runtimeDir, err := util.GetRuntimeDir()
+ runtimeDir, err := homedir.GetRuntimeDir()
  if err != nil {
  return "", err
  }

diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go
@@ -30,7 +30,7 @@ import (
  "sync"
 
  "github.com/containernetworking/plugins/pkg/ns"
- "github.com/containers/common/pkg/util"
+ "github.com/containers/storage/pkg/homedir"
  "github.com/containers/storage/pkg/unshare"
  "github.com/sirupsen/logrus"
  "golang.org/x/sys/unix"
@@ -40,7 +40,7 @@ import (
 // rootless, it needs to be at a location writable by user.
 func GetNSRunDir() (string, error) {
  if unshare.IsRootless() {
- rootlessDir, err := util.GetRuntimeDir()
+ rootlessDir, err := homedir.GetRuntimeDir()
  if err != nil {
  return "", err
  }

diff --git a/pkg/util/util_supported.go b/pkg/util/util_supported.go
diff --git a/pkg/util/util_windows.go b/pkg/util/util_windows.go