summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-10 21:57:04 +0100
committerGitHub <noreply@github.com>2020-03-10 21:57:04 +0100
commitfe49daa3c2e83bd0ec8ee36ec156b73967f4f0da (patch)
treeaab55239add80e612af4553382f744df1b793c85 /cmd
parentd083d6a8fc965a7eb42045a72f4685052860a2bd (diff)
parent7534f9dd1a2e9ee4b7a7a7333ff2ec636949d68f (diff)
downloadpodman-fe49daa3c2e83bd0ec8ee36ec156b73967f4f0da.tar.gz
podman-fe49daa3c2e83bd0ec8ee36ec156b73967f4f0da.tar.bz2
podman-fe49daa3c2e83bd0ec8ee36ec156b73967f4f0da.zip
Merge pull request #5402 from vrothberg/syslog
docs: clarify bools in `podman --help`
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/main_local.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go
index e5b87754b..79b5e5af7 100644
--- a/cmd/podman/main_local.go
+++ b/cmd/podman/main_local.go
@@ -67,10 +67,11 @@ func init() {
// -s is deprecated due to conflict with -s on subcommands
rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.StorageDriver, "storage-driver", "", "Select which storage driver is used to manage storage of images and containers (default is overlay)")
rootCmd.PersistentFlags().StringArrayVar(&MainGlobalOpts.StorageOpts, "storage-opt", []string{}, "Used to pass an option to the storage driver")
- rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Syslog, "syslog", false, "Output logging information to syslog as well as the console")
+ rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Syslog, "syslog", false, "Output logging information to syslog as well as the console (default false)")
rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.TmpDir, "tmpdir", "", "Path to the tmp directory for libpod state content.\n\nNote: use the environment variable 'TMPDIR' to change the temporary storage location for container images, '/var/tmp'.\n")
- rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Trace, "trace", false, "Enable opentracing output")
+ rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Trace, "trace", false, "Enable opentracing output (default false)")
+ markFlagHidden(rootCmd.PersistentFlags(), "trace")
}
func setSyslog() error {