summaryrefslogtreecommitdiff
path: root/pkg/domain/entities/engine.go
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-03-23 10:27:32 -0700
committerJhon Honce <jhonce@redhat.com>2020-03-24 11:03:13 -0700
commit77a2af8817284d134ea1f30f0b06291a5b05c5a0 (patch)
treef6ed82f9c435c30b44d5c820502607ba60e89282 /pkg/domain/entities/engine.go
parentc29a4c69044c02eee564fc72c64144b2a76d1d73 (diff)
downloadpodman-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 'pkg/domain/entities/engine.go')
-rw-r--r--pkg/domain/entities/engine.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go
index 08ef1df92..8553f5326 100644
--- a/pkg/domain/entities/engine.go
+++ b/pkg/domain/entities/engine.go
@@ -19,16 +19,12 @@ func (m EngineMode) String() string {
return string(m)
}
-// FIXME: merge EngineOptions and EngineFlags
type EngineOptions struct {
Uri string
Identities []string
FlagSet *pflag.FlagSet
- Flags EngineFlags
EngineMode EngineMode
-}
-type EngineFlags struct {
CGroupManager string
CniConfigDir string
ConmonPath string
@@ -61,9 +57,9 @@ type EngineFlags struct {
IgnoreHosts bool
}
-func NewEngineOptions() (EngineFlags, error) {
+func NewEngineOptions() (EngineOptions, error) {
u, _ := user.Current()
- return EngineFlags{
+ return EngineOptions{
CGroupManager: define.SystemdCgroupsManager,
CniConfigDir: "",
Config: "",