diff options
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 5f7bfe3c9..481214a38 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -4,9 +4,10 @@ import ( "os" _ "github.com/containers/libpod/cmd/podman/containers" + _ "github.com/containers/libpod/cmd/podman/generate" _ "github.com/containers/libpod/cmd/podman/healthcheck" _ "github.com/containers/libpod/cmd/podman/images" - _ "github.com/containers/libpod/cmd/podman/networks" + _ "github.com/containers/libpod/cmd/podman/manifest" _ "github.com/containers/libpod/cmd/podman/pods" "github.com/containers/libpod/cmd/podman/registry" _ "github.com/containers/libpod/cmd/podman/system" @@ -14,12 +15,6 @@ import ( "github.com/containers/storage/pkg/reexec" ) -func init() { - // This is the bootstrap configuration, if user gives - // CLI flags parts of this configuration may be overwritten - registry.PodmanOptions = registry.NewPodmanConfig() -} - func main() { if reexec.Init() { // We were invoked with a different argv[0] indicating that we @@ -27,9 +22,10 @@ func main() { return } + cfg := registry.PodmanConfig() for _, c := range registry.Commands { for _, m := range c.Mode { - if registry.PodmanOptions.EngineMode == m { + if cfg.EngineMode == m { parent := rootCmd if c.Parent != nil { parent = c.Parent |