summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/libpodruntime/runtime.go4
-rw-r--r--cmd/podman/main.go5
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",