diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-17 02:35:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 02:35:50 -0700 |
| commit | d31dcb9bbd521fe8e3e78b0ebe2a893634ab2e6b (patch) | |
| tree | 215280684ce6195fac64f18ebd7d29c5baa376cc /cmd/podman/main.go | |
| parent | 0d2b5532c417c58bd24e71a56c5c55b43e423a59 (diff) | |
| parent | 554c663b5ad2bd0c0fa4c58559ec2a9b19ed399f (diff) | |
| download | podman-d31dcb9bbd521fe8e3e78b0ebe2a893634ab2e6b.tar.gz podman-d31dcb9bbd521fe8e3e78b0ebe2a893634ab2e6b.tar.bz2 podman-d31dcb9bbd521fe8e3e78b0ebe2a893634ab2e6b.zip | |
Merge pull request #5856 from jwhonce/wip/options
Fix bug where two configurations had been created
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 5f7bfe3c9..2d9e45177 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -14,12 +14,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 +21,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 |