|
 |
814f49 |
From e8008604cb0a1921ab416302265ed50d504696f5 Mon Sep 17 00:00:00 2001
|
|
|
814f49 |
From: Mrunal Patel <mrunalp@gmail.com>
|
|
|
814f49 |
Date: Wed, 5 Apr 2017 07:46:28 -0700
|
|
|
814f49 |
Subject: [PATCH] Change the default --root to /run/runc-ctrs
|
|
|
814f49 |
|
|
|
814f49 |
This avoids the unmarshalling issues with older docker-runc
|
|
|
814f49 |
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
|
|
|
814f49 |
---
|
|
|
814f49 |
list.go | 2 +-
|
|
|
814f49 |
main.go | 2 +-
|
|
|
814f49 |
man/runc-list.8.md | 2 +-
|
|
|
814f49 |
man/runc.8.md | 2 +-
|
|
|
814f49 |
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
814f49 |
|
|
|
814f49 |
diff --git a/list.go b/list.go
|
|
|
814f49 |
index c7550a2..75ee2fc 100644
|
|
|
814f49 |
--- a/list.go
|
|
|
814f49 |
+++ b/list.go
|
|
|
814f49 |
@@ -46,7 +46,7 @@ var listCommand = cli.Command{
|
|
|
814f49 |
ArgsUsage: `
|
|
|
814f49 |
|
|
|
814f49 |
Where the given root is specified via the global option "--root"
|
|
|
814f49 |
-(default: "/run/runc").
|
|
|
814f49 |
+(default: "/run/runc-ctrs").
|
|
|
814f49 |
|
|
|
814f49 |
EXAMPLE 1:
|
|
|
814f49 |
To list containers created via the default "--root":
|
|
|
814f49 |
diff --git a/main.go b/main.go
|
|
|
814f49 |
index 1cb8f4d..0b34488 100644
|
|
|
814f49 |
--- a/main.go
|
|
|
814f49 |
+++ b/main.go
|
|
|
814f49 |
@@ -77,7 +77,7 @@ func main() {
|
|
|
814f49 |
},
|
|
|
814f49 |
cli.StringFlag{
|
|
|
814f49 |
Name: "root",
|
|
|
814f49 |
- Value: "/run/runc",
|
|
|
814f49 |
+ Value: "/run/runc-ctrs",
|
|
|
814f49 |
Usage: "root directory for storage of container state (this should be located in tmpfs)",
|
|
|
814f49 |
},
|
|
|
814f49 |
cli.StringFlag{
|
|
|
814f49 |
diff --git a/man/runc-list.8.md b/man/runc-list.8.md
|
|
|
814f49 |
index f737424..107220e 100644
|
|
|
814f49 |
--- a/man/runc-list.8.md
|
|
|
814f49 |
+++ b/man/runc-list.8.md
|
|
|
814f49 |
@@ -6,7 +6,7 @@
|
|
|
814f49 |
|
|
|
814f49 |
# EXAMPLE
|
|
|
814f49 |
Where the given root is specified via the global option "--root"
|
|
|
814f49 |
-(default: "/run/runc").
|
|
|
814f49 |
+(default: "/run/runc-ctrs").
|
|
|
814f49 |
|
|
|
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
|
|
|
814f49 |
index b5a8c54..c3a07fb 100644
|
|
|
814f49 |
--- a/man/runc.8.md
|
|
|
814f49 |
+++ b/man/runc.8.md
|
|
|
814f49 |
@@ -50,7 +50,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")
|
|
|
814f49 |
- --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc")
|
|
|
814f49 |
+ --root value root directory for storage of container state (this should be located in tmpfs) (default: "/run/runc-ctrs")
|
|
|
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"
|
|
|
814f49 |
--help, -h show help
|