|
 |
c6b183 |
From bc548da226f683aa123551295b95d9c11621b7bf Mon Sep 17 00:00:00 2001
|
|
|
c6b183 |
From: Lokesh Mandvekar <lsm5@redhat.com>
|
|
|
c6b183 |
Date: Thu, 4 Jul 2019 19:17:16 +0000
|
|
|
c6b183 |
Subject: [PATCH] change default root
|
|
|
c6b183 |
|
|
|
c6b183 |
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
|
|
|
c6b183 |
---
|
|
|
c6b183 |
list.go | 2 +-
|
|
|
c6b183 |
main.go | 4 ++--
|
|
|
c6b183 |
man/runc-list.8.md | 2 +-
|
|
|
c6b183 |
man/runc.8.md | 2 +-
|
|
|
c6b183 |
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
c6b183 |
|
|
|
f24a48 |
diff --git a/list.go b/list.go
|
|
|
c6b183 |
index 0313d8c..328798b 100644
|
|
|
f24a48 |
--- a/list.go
|
|
|
f24a48 |
+++ b/list.go
|
|
|
efbbe3 |
@@ -50,7 +50,7 @@ var listCommand = cli.Command{
|
|
|
f24a48 |
ArgsUsage: `
|
|
|
c6b183 |
|
|
|
f24a48 |
Where the given root is specified via the global option "--root"
|
|
|
f24a48 |
-(default: "/run/runc").
|
|
|
f24a48 |
+(default: "/run/runc-ctrs").
|
|
|
c6b183 |
|
|
|
f24a48 |
EXAMPLE 1:
|
|
|
f24a48 |
To list containers created via the default "--root":
|
|
|
f24a48 |
diff --git a/main.go b/main.go
|
|
|
c6b183 |
index 072447d..e675a96 100644
|
|
|
f24a48 |
--- a/main.go
|
|
|
f24a48 |
+++ b/main.go
|
|
|
c6b183 |
@@ -62,10 +62,10 @@ func main() {
|
|
|
efbbe3 |
v = append(v, fmt.Sprintf("spec: %s", specs.Version))
|
|
|
efbbe3 |
app.Version = strings.Join(v, "\n")
|
|
|
c6b183 |
|
|
|
efbbe3 |
- root := "/run/runc"
|
|
|
efbbe3 |
+ root := "/run/runc-ctrs"
|
|
|
c6b183 |
if shouldHonorXDGRuntimeDir() {
|
|
|
c6b183 |
if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
|
|
|
efbbe3 |
- root = runtimeDir + "/runc"
|
|
|
efbbe3 |
+ root = runtimeDir + "/runc-ctrs"
|
|
|
c8282c |
// According to the XDG specification, we need to set anything in
|
|
|
c8282c |
// XDG_RUNTIME_DIR to have a sticky bit if we don't want it to get
|
|
|
c8282c |
// auto-pruned.
|
|
|
f24a48 |
diff --git a/man/runc-list.8.md b/man/runc-list.8.md
|
|
|
c6b183 |
index f737424..107220e 100644
|
|
|
f24a48 |
--- a/man/runc-list.8.md
|
|
|
f24a48 |
+++ b/man/runc-list.8.md
|
|
|
f24a48 |
@@ -6,7 +6,7 @@
|
|
|
c6b183 |
|
|
|
f24a48 |
# EXAMPLE
|
|
|
f24a48 |
Where the given root is specified via the global option "--root"
|
|
|
f24a48 |
-(default: "/run/runc").
|
|
|
f24a48 |
+(default: "/run/runc-ctrs").
|
|
|
c6b183 |
|
|
|
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
|
|
|
c6b183 |
index 6d0ddff..9d6816d 100644
|
|
|
f24a48 |
--- a/man/runc.8.md
|
|
|
f24a48 |
+++ b/man/runc.8.md
|
|
|
6752f3 |
@@ -51,7 +51,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")
|
|
|
efbbe3 |
- --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)
|
|
|
c6b183 |
+ --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)
|
|
|
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"
|
|
|
6752f3 |
--rootless value enable rootless mode ('true', 'false', or 'auto') (default: "auto")
|
|
|
c6b183 |
--
|
|
|
c6b183 |
1.8.3.1
|
|
|
c6b183 |
|