11acd1
From bc548da226f683aa123551295b95d9c11621b7bf Mon Sep 17 00:00:00 2001
11acd1
From: Lokesh Mandvekar <lsm5@redhat.com>
11acd1
Date: Thu, 4 Jul 2019 19:17:16 +0000
11acd1
Subject: [PATCH] change default root
11acd1
11acd1
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
11acd1
---
11acd1
 list.go            | 2 +-
11acd1
 main.go            | 4 ++--
11acd1
 man/runc-list.8.md | 2 +-
11acd1
 man/runc.8.md      | 2 +-
11acd1
 4 files changed, 5 insertions(+), 5 deletions(-)
11acd1
814f49
diff --git a/list.go b/list.go
11acd1
index 0313d8c..328798b 100644
814f49
--- a/list.go
814f49
+++ b/list.go
95b1d4
@@ -50,7 +50,7 @@ var listCommand = cli.Command{
814f49
 	ArgsUsage: `
11acd1
814f49
 Where the given root is specified via the global option "--root"
814f49
-(default: "/run/runc").
814f49
+(default: "/run/runc-ctrs").
11acd1
814f49
 EXAMPLE 1:
814f49
 To list containers created via the default "--root":
814f49
diff --git a/main.go b/main.go
11acd1
index 072447d..e675a96 100644
814f49
--- a/main.go
814f49
+++ b/main.go
11acd1
@@ -62,10 +62,10 @@ func main() {
95b1d4
 	v = append(v, fmt.Sprintf("spec: %s", specs.Version))
95b1d4
 	app.Version = strings.Join(v, "\n")
11acd1
95b1d4
-	root := "/run/runc"
95b1d4
+	root := "/run/runc-ctrs"
11acd1
 	if shouldHonorXDGRuntimeDir() {
11acd1
 		if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
95b1d4
-			root = runtimeDir + "/runc"
95b1d4
+			root = runtimeDir + "/runc-ctrs"
ade5cc
 			// According to the XDG specification, we need to set anything in
ade5cc
 			// XDG_RUNTIME_DIR to have a sticky bit if we don't want it to get
ade5cc
 			// auto-pruned.
814f49
diff --git a/man/runc-list.8.md b/man/runc-list.8.md
11acd1
index f737424..107220e 100644
814f49
--- a/man/runc-list.8.md
814f49
+++ b/man/runc-list.8.md
814f49
@@ -6,7 +6,7 @@
11acd1
814f49
 # EXAMPLE
814f49
 Where the given root is specified via the global option "--root"
814f49
-(default: "/run/runc").
814f49
+(default: "/run/runc-ctrs").
11acd1
814f49
 To list containers created via the default "--root":
814f49
        # runc list
814f49
diff --git a/man/runc.8.md b/man/runc.8.md
11acd1
index 6d0ddff..9d6816d 100644
814f49
--- a/man/runc.8.md
814f49
+++ b/man/runc.8.md
390bb1
@@ -51,7 +51,7 @@ value for "bundle" is the current directory.
814f49
    --debug              enable debug output for logging
814f49
    --log value          set the log file path where internal debug information is written (default: "/dev/null")
814f49
    --log-format value   set the format used by logs ('text' (default), or 'json') (default: "text")
95b1d4
-   --root value         root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc" or $XDG_RUNTIME_DIR/runc for rootless containers)
11acd1
+   --root value         root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc-ctrs" or $XDG_RUNTIME_DIR/runc for rootless containers)
814f49
    --criu value         path to the criu binary used for checkpoint and restore (default: "criu")
814f49
    --systemd-cgroup     enable systemd cgroup support, expects cgroupsPath to be of form "slice:prefix:name" for e.g. "system.slice:runc:434234"
390bb1
    --rootless value    enable rootless mode ('true', 'false', or 'auto') (default: "auto")
11acd1
-- 
11acd1
1.8.3.1
11acd1