From fb10263a4b9d5db5a6ff1d66f7f7b613e0478c1b Mon Sep 17 00:00:00 2001 From: Suraj Deshmukh Date: Tue, 25 Apr 2017 10:24:26 +0530 Subject: [PATCH] Change default runc location With the current supported version of runc(1.0.0-rc3) in cri-o the default installation location is `/usr/local/sbin/runc` as opposed to `/usr/bin/runc` so changing that everywhere. Signed-off-by: Suraj Deshmukh --- docs/ocid.8.md | 2 +- docs/ocid.conf.5.md | 2 +- server/config.go | 2 +- tutorial.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/ocid.8.md b/docs/ocid.8.md index 89001e87..ba84b29f 100644 --- a/docs/ocid.8.md +++ b/docs/ocid.8.md @@ -87,7 +87,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and OCID state dir (default: "/var/run/containers/storage") **--runtime**="" - OCI runtime path (default: "/usr/bin/runc") + OCI runtime path (default: "/usr/local/sbin/runc") **--selinux**=*true*|*false* Enable selinux support (default: false) diff --git a/docs/ocid.conf.5.md b/docs/ocid.conf.5.md index e566ad19..05752292 100644 --- a/docs/ocid.conf.5.md +++ b/docs/ocid.conf.5.md @@ -55,7 +55,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/local/sbin/runc") **selinux**=*true*|*false* Enable selinux support (default: false) diff --git a/server/config.go b/server/config.go index 59233772..805f08b4 100644 --- a/server/config.go +++ b/server/config.go @@ -207,7 +207,7 @@ func DefaultConfig() *Config { Listen: "/var/run/ocid.sock", }, RuntimeConfig: RuntimeConfig{ - Runtime: "/usr/bin/runc", + Runtime: "/usr/local/sbin/runc", RuntimeHostPrivileged: "", Conmon: conmonPath, ConmonEnv: []string{ diff --git a/tutorial.md b/tutorial.md index 584e084f..f8740fe5 100644 --- a/tutorial.md +++ b/tutorial.md @@ -46,7 +46,7 @@ chmod +x runc-linux-amd64 ``` ``` -sudo mv runc-linux-amd64 /usr/bin/runc +sudo mv runc-linux-amd64 /usr/local/sbin/runc ``` Print the `runc` version: