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