diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-05 12:14:57 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-06 14:48:51 +0000 |
| commit | 2e6243b18539175b5ff029a924c4d83834f83d2b (patch) | |
| tree | a034560d697b1ce7e07497da96bce9886887d9bd /cmd | |
| parent | 490cc82d0b48f118b32525b568b3ed5e1fc82973 (diff) | |
| download | podman-2e6243b18539175b5ff029a924c4d83834f83d2b.tar.gz podman-2e6243b18539175b5ff029a924c4d83834f83d2b.tar.bz2 podman-2e6243b18539175b5ff029a924c4d83834f83d2b.zip | |
Fix up libpod.conf man pages and referencese to it.
Remove podman --config option, since it does not do anything.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1410
Approved by: mheon
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 4 | ||||
| -rw-r--r-- | cmd/podman/main.go | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index ec105719f..b7281ed8c 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -132,6 +132,8 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions if c.IsSet("infra-command") { options = append(options, libpod.WithDefaultInfraCommand(c.String("infra-command"))) } - + if c.IsSet("config") { + return libpod.NewRuntimeFromConfig(c.String("config"), options...) + } return libpod.NewRuntime(options...) } diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 9d8d212b8..8d470e10d 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -170,8 +170,9 @@ func main() { Usage: "path of the configuration directory for CNI networks", }, cli.StringFlag{ - Name: "config, c", - Usage: "path of a config file detailing container server configuration options", + Name: "config, c", + Usage: "path of a libpod config file detailing container server configuration options", + Hidden: true, }, cli.StringFlag{ Name: "conmon", |