Merge pull request #119 from rhatdan/selinux

Fix up man page with missing options
This commit is contained in:
Mrunal Patel 2016-10-07 14:01:05 -05:00 committed by GitHub
commit cc732301ac

View file

@ -6,16 +6,18 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
# SYNOPSIS # SYNOPSIS
**ocid** **ocid**
[**--root**=[*value*]]
[**--conmon**=[*value*]] [**--conmon**=[*value*]]
[**--sandboxdir**=[*value*]]
[**--containerdir**=[*value*]] [**--containerdir**=[*value*]]
[**--socket**=[*value*]]
[**--runtime**=[*value*]]
[**--debug**] [**--debug**]
[**--help**|**-h**]
[**--log**=[*value*]] [**--log**=[*value*]]
[**--log-format value**] [**--log-format value**]
[**--help**|**-h**] [**--pause**=[*value*]]
[**--root**=[*value*]]
[**--runtime**=[*value*]]
[**--sandboxdir**=[*value*]]
[**--selinux-enabled**]
[**--socket**=[*value*]]
[**--version**|**-v**] [**--version**|**-v**]
# DESCRIPTION # DESCRIPTION
@ -34,35 +36,41 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
# OPTIONS # OPTIONS
**--root**=""
OCID root dir (default: "/var/lib/ocid")
**--sandboxdir**=""
OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes")
**--conmon**="" **--conmon**=""
path to the conmon executable (default: "/usr/libexec/ocid/conmon") path to the conmon executable (default: "/usr/libexec/ocid/conmon")
**--containerdir**="" **--containerdir**=""
OCID container dir (default: "/var/lib/ocid/containers") OCID container dir (default: "/var/lib/ocid/containers")
**--socket**=""
Path to ocid socket (default: "/var/run/ocid.sock")
**--runtime**=""
OCI runtime path (default: "/usr/bin/runc")
**--debug** **--debug**
Enable debug output for logging Enable debug output for logging
**--help, -h**
Print usage statement
**--log**="" **--log**=""
Set the log file path where internal debug information is written Set the log file path where internal debug information is written
**--log-format**="" **--log-format**=""
Set the format used by logs ('text' (default), or 'json') (default: "text") Set the format used by logs ('text' (default), or 'json') (default: "text")
**--help, -h** **--pause**=""
Print usage statement Path to the pause executable (default: "/usr/libexec/ocid/pause")
**--root**=""
OCID root dir (default: "/var/lib/ocid")
**--runtime**=""
OCI runtime path (default: "/usr/bin/runc")
**--sandboxdir**=""
OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes")
**--selinux-enabled**
Enable selinux support
**--socket**=""
Path to ocid socket (default: "/var/run/ocid.sock")
**--version, -v** **--version, -v**
Print the version Print the version