From e8008604cb0a1921ab416302265ed50d504696f5 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 5 Apr 2017 07:46:28 -0700 Subject: [PATCH] Change the default --root to /run/runc-ctrs This avoids the unmarshalling issues with older docker-runc Signed-off-by: Mrunal Patel --- list.go | 2 +- main.go | 2 +- man/runc-list.8.md | 2 +- man/runc.8.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/list.go b/list.go index c7550a2..75ee2fc 100644 --- a/list.go +++ b/list.go @@ -46,7 +46,7 @@ var listCommand = cli.Command{ ArgsUsage: ` Where the given root is specified via the global option "--root" -(default: "/run/runc"). +(default: "/run/runc-ctrs"). EXAMPLE 1: To list containers created via the default "--root": diff --git a/main.go b/main.go index 1cb8f4d..0b34488 100644 --- a/main.go +++ b/main.go @@ -77,7 +77,7 @@ func main() { }, cli.StringFlag{ Name: "root", - Value: "/run/runc", + Value: "/run/runc-ctrs", Usage: "root directory for storage of container state (this should be located in tmpfs)", }, cli.StringFlag{ diff --git a/man/runc-list.8.md b/man/runc-list.8.md index f737424..107220e 100644 --- a/man/runc-list.8.md +++ b/man/runc-list.8.md @@ -6,7 +6,7 @@ # EXAMPLE Where the given root is specified via the global option "--root" -(default: "/run/runc"). +(default: "/run/runc-ctrs"). To list containers created via the default "--root": # runc list diff --git a/man/runc.8.md b/man/runc.8.md index b5a8c54..c3a07fb 100644 --- a/man/runc.8.md +++ b/man/runc.8.md @@ -50,7 +50,7 @@ value for "bundle" is the current directory. --debug enable debug output for logging --log value set the log file path where internal debug information is written (default: "/dev/null") --log-format value set the format used by logs ('text' (default), or 'json') (default: "text") - --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc") + --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc-ctrs") --criu value path to the criu binary used for checkpoint and restore (default: "criu") --systemd-cgroup enable systemd cgroup support, expects cgroupsPath to be of form "slice:prefix:name" for e.g. "system.slice:runc:434234" --help, -h show help