opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-13 09:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5402 from vrothberg/syslog

Browse Source 
docs: clarify bools in `podman --help`
This commit is contained in:
OpenShift Merge Robot
2020-03-10 21:57:04 +01:00
committed by GitHub
parent d083d6a8fc 7534f9dd1a
commit fe49daa3c2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/main_local.go
View File

@ -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 {

6
docs/source/markdown/podman.1.md
View File

@ -104,11 +104,11 @@ specify additional options via the `--storage-opt` flag.
Storage driver option, Default storage driver options are configured in /etc/containers/storage.conf (`$HOME/.config/containers/storage.conf` in rootless mode). The `STORAGE_OPTS` environment variable overrides the default. The --storage-opt specified options overrides all.
**--syslog**
**--syslog**=*true|false*
Output logging information to syslog as well as the console.
Output logging information to syslog as well as the console (default *false*).
On remote clients, logging is directed to the file $HOME/.config/containers/podman.log
On remote clients, logging is directed to the file $HOME/.config/containers/podman.log.
**--tmpdir**