From 041fb04c4e28caee8217defa11d98e5eb99c9273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBy=C5=82owski?= Date: Wed, 14 Dec 2016 20:05:50 +0100 Subject: [PATCH] ocid, docs: change default runc path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Żyłowski --- cmd/server/config.go | 2 +- docs/ocid.8.md | 2 +- docs/ocid.conf.5.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/server/config.go b/cmd/server/config.go index 0988976e..de316f55 100644 --- a/cmd/server/config.go +++ b/cmd/server/config.go @@ -94,7 +94,7 @@ func DefaultConfig() *server.Config { Listen: "/var/run/ocid.sock", }, RuntimeConfig: server.RuntimeConfig{ - Runtime: "/usr/bin/runc", + Runtime: "/usr/sbin/runc", Conmon: conmonPath, ConmonEnv: []string{ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", diff --git a/docs/ocid.8.md b/docs/ocid.8.md index aad95477..146a60bf 100644 --- a/docs/ocid.8.md +++ b/docs/ocid.8.md @@ -72,7 +72,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and OCID root dir (default: "/var/lib/ocid") **--runtime**="" - OCI runtime path (default: "/usr/bin/runc") + OCI runtime path (default: "/usr/sbin/runc") **--sandboxdir**="" OCID pod sandbox dir (default: "/var/lib/ocid/sandboxes") diff --git a/docs/ocid.conf.5.md b/docs/ocid.conf.5.md index 20a95dd8..c188866f 100644 --- a/docs/ocid.conf.5.md +++ b/docs/ocid.conf.5.md @@ -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",]) **runtime**="" - OCI runtime path (default: "/usr/bin/runc") + OCI runtime path (default: "/usr/sbin/runc") **selinux**=*true*|*false* Enable selinux support (default: false)