Blob Blame Raw
From bc548da226f683aa123551295b95d9c11621b7bf Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@redhat.com>
Date: Thu, 4 Jul 2019 19:17:16 +0000
Subject: [PATCH] change default root

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
---
 list.go            | 2 +-
 main.go            | 4 ++--
 man/runc-list.8.md | 2 +-
 man/runc.8.md      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/list.go b/list.go
index 0313d8c..328798b 100644
--- a/list.go
+++ b/list.go
@@ -50,7 +50,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 072447d..e675a96 100644
--- a/main.go
+++ b/main.go
@@ -62,10 +62,10 @@ func main() {
 	v = append(v, fmt.Sprintf("spec: %s", specs.Version))
 	app.Version = strings.Join(v, "\n")

-	root := "/run/runc"
+	root := "/run/runc-ctrs"
 	if shouldHonorXDGRuntimeDir() {
 		if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
-			root = runtimeDir + "/runc"
+			root = runtimeDir + "/runc-ctrs"
 			// According to the XDG specification, we need to set anything in
 			// XDG_RUNTIME_DIR to have a sticky bit if we don't want it to get
 			// auto-pruned.
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 6d0ddff..9d6816d 100644
--- a/man/runc.8.md
+++ b/man/runc.8.md
@@ -51,7 +51,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" or $XDG_RUNTIME_DIR/runc for rootless containers)
+   --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)
    --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"
    --rootless value    enable rootless mode ('true', 'false', or 'auto') (default: "auto")
-- 
1.8.3.1