diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-24 15:38:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 15:38:46 -0500 |
| commit | 4988e39c645c5c520fdc9094fdb1bd4a45a852a0 (patch) | |
| tree | 8c9f6b6136137f9f8d19b83c240b2b18675b73f4 /cmd | |
| parent | 667dfb4ac3ca4b7d7726240db04de4d4b10f8bbd (diff) | |
| parent | 1cddd63976b8f266ab4d5088061b7b8cd0f3b412 (diff) | |
| download | podman-4988e39c645c5c520fdc9094fdb1bd4a45a852a0.tar.gz podman-4988e39c645c5c520fdc9094fdb1bd4a45a852a0.tar.bz2 podman-4988e39c645c5c520fdc9094fdb1bd4a45a852a0.zip | |
Merge pull request #12982 from rhatdan/default
Show correct default values or show none
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/root.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index be6eacfc2..6d768c2e6 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -415,12 +415,12 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) { _ = cmd.RegisterFlagCompletionFunc(runrootFlagName, completion.AutocompleteDefault) runtimeFlagName := "runtime" - pFlags.StringVar(&opts.RuntimePath, runtimeFlagName, "", "Path to the OCI-compatible binary used to run containers, default is /usr/bin/runc") + pFlags.StringVar(&opts.RuntimePath, runtimeFlagName, cfg.Engine.OCIRuntime, "Path to the OCI-compatible binary used to run containers.") _ = cmd.RegisterFlagCompletionFunc(runtimeFlagName, completion.AutocompleteDefault) // -s is deprecated due to conflict with -s on subcommands storageDriverFlagName := "storage-driver" - pFlags.StringVar(&opts.StorageDriver, storageDriverFlagName, "", "Select which storage driver is used to manage storage of images and containers (default is overlay)") + pFlags.StringVar(&opts.StorageDriver, storageDriverFlagName, "", "Select which storage driver is used to manage storage of images and containers") _ = cmd.RegisterFlagCompletionFunc(storageDriverFlagName, completion.AutocompleteNone) //TODO: what can we recommend here? tmpdirFlagName := "tmpdir" |