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

specgen: use storageTypes instead of storage package

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2024-01-25 13:31:26 +01:00
parent 7aede410da
commit 08cd7ce41b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/specgen/namespaces.go
View File

@ -13,7 +13,7 @@ import (
"github.com/containers/podman/v4/pkg/namespaces" "github.com/containers/podman/v4/pkg/namespaces"
"github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/pkg/util" "github.com/containers/podman/v4/pkg/util"
"github.com/containers/storage" storageTypes "github.com/containers/storage/types"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/generate"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
@ -488,7 +488,7 @@ func parseBridgeNetworkOptions(opts string) (types.PerNetworkOptions, error) {
return netOpts, nil return netOpts, nil
} }
func SetupUserNS(idmappings *storage.IDMappingOptions, userns Namespace, g *generate.Generator) (string, error) { func SetupUserNS(idmappings *storageTypes.IDMappingOptions, userns Namespace, g *generate.Generator) (string, error) {
// User // User
var user string var user string
switch userns.NSMode { switch userns.NSMode {
@ -544,7 +544,7 @@ func SetupUserNS(idmappings *storage.IDMappingOptions, userns Namespace, g *gene
return user, nil return user, nil
} }
func privateUserNamespace(idmappings *storage.IDMappingOptions, g *generate.Generator) error { func privateUserNamespace(idmappings *storageTypes.IDMappingOptions, g *generate.Generator) error {
if err := g.AddOrReplaceLinuxNamespace(string(spec.UserNamespace), ""); err != nil { if err := g.AddOrReplaceLinuxNamespace(string(spec.UserNamespace), ""); err != nil {
return err return err
} }