vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 041fb04c4e into 1df8e6638b

Browse source
This commit is contained in:
Michał Żyłowski 2017-01-17 00:24:37 +00:00 • committed by GitHub
commit 77ee41cb97
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/server/config.go
View file

@ -112,7 +112,7 @@ func DefaultConfig() *server.Config {
Listen: "/var/run/ocid.sock", Listen: "/var/run/ocid.sock",
}, },
RuntimeConfig: server.RuntimeConfig{ RuntimeConfig: server.RuntimeConfig{
Runtime: "/usr/bin/runc", Runtime: "/usr/sbin/runc",
Conmon: conmonPath, Conmon: conmonPath,
ConmonEnv: []string{ ConmonEnv: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",

2
docs/ocid.8.md
View file

@ -74,7 +74,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
OCID root dir (default: "/var/lib/ocid") OCID root dir (default: "/var/lib/ocid")
**--runtime**="" **--runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/sbin/runc")
**--sandboxdir**="" **--sandboxdir**=""
OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes") OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes")

2
docs/ocid.conf.5.md
View file

@ -53,7 +53,7 @@ The `ocid` table supports the following options:
Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",]) Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",])
**runtime**="" **runtime**=""
OCI runtime path (default: "/usr/bin/runc") OCI runtime path (default: "/usr/sbin/runc")
**selinux**=*true*|*false* **selinux**=*true*|*false*
Enable selinux support (default: false) Enable selinux support (default: false)