diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-03-23 10:27:32 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-03-24 11:03:13 -0700 |
| commit | 77a2af8817284d134ea1f30f0b06291a5b05c5a0 (patch) | |
| tree | f6ed82f9c435c30b44d5c820502607ba60e89282 /cmd/podmanV2/main.go | |
| parent | c29a4c69044c02eee564fc72c64144b2a76d1d73 (diff) | |
| download | podman-77a2af8817284d134ea1f30f0b06291a5b05c5a0.tar.gz podman-77a2af8817284d134ea1f30f0b06291a5b05c5a0.tar.bz2 podman-77a2af8817284d134ea1f30f0b06291a5b05c5a0.zip | |
Combine GlobalFlags and EngineFlags into EngineOptions
* EngineOptions obtained in command via
`opt, err := registry.Options(cmd)`
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podmanV2/main.go')
| -rw-r--r-- | cmd/podmanV2/main.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podmanV2/main.go b/cmd/podmanV2/main.go index 24f21d804..dc96c26d0 100644 --- a/cmd/podmanV2/main.go +++ b/cmd/podmanV2/main.go @@ -32,9 +32,9 @@ func initCobra() { case "darwin": fallthrough case "windows": - registry.EngineOpts.EngineMode = entities.TunnelMode + registry.EngineOptions.EngineMode = entities.TunnelMode case "linux": - registry.EngineOpts.EngineMode = entities.ABIMode + registry.EngineOptions.EngineMode = entities.ABIMode default: logrus.Errorf("%s is not a supported OS", runtime.GOOS) os.Exit(1) @@ -43,7 +43,7 @@ func initCobra() { // TODO: Is there a Cobra way to "peek" at os.Args? for _, v := range os.Args { if strings.HasPrefix(v, "--remote") { - registry.EngineOpts.EngineMode = entities.TunnelMode + registry.EngineOptions.EngineMode = entities.TunnelMode } } @@ -53,7 +53,7 @@ func initCobra() { func main() { fmt.Fprintf(os.Stderr, "Number of commands: %d\n", len(registry.Commands)) for _, c := range registry.Commands { - if Contains(registry.EngineOpts.EngineMode, c.Mode) { + if Contains(registry.EngineOptions.EngineMode, c.Mode) { parent := rootCmd if c.Parent != nil { parent = c.Parent |