diff options
Diffstat (limited to 'cmd/podman/registry/config.go')
| -rw-r--r-- | cmd/podman/registry/config.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 75e67b35d..0e29d5cd9 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -8,14 +8,15 @@ import ( "sync" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) const ( - ParentNSRequired = "ParentNSRequired" + ParentNSRequired = "ParentNSRequired" + UnshareNSRequired = "UnshareNSRequired" ) var ( @@ -33,7 +34,7 @@ func PodmanConfig() *entities.PodmanConfig { func newPodmanConfig() { if err := setXdgDirs(); err != nil { - fmt.Fprintf(os.Stderr, err.Error()) + fmt.Fprintln(os.Stderr, err.Error()) os.Exit(1) } @@ -44,11 +45,12 @@ func newPodmanConfig() { case "linux": // Some linux clients might only be compiled without ABI // support (e.g., podman-remote). - if abiSupport && !remoteOverride { + if abiSupport && !IsRemote() { mode = entities.ABIMode } else { mode = entities.TunnelMode } + default: fmt.Fprintf(os.Stderr, "%s is not a supported OS", runtime.GOOS) os.Exit(1) @@ -70,7 +72,7 @@ func newPodmanConfig() { // setXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set. // containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is -// use for the libpod.conf configuration file. +// use for the containers.conf configuration file. func setXdgDirs() error { if !rootless.IsRootless() { return nil |