summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-11-01 00:43:02 +0000
committergVisor bot <gvisor-bot@google.com>2019-11-01 00:43:02 +0000
commitb8e50d110eb58d1b85b93968358d689dd9250d2d (patch)
treef748e41dc61806b313dd0fd1d93e93ca56bea6de
parentc78dae54adf9106178e7c0bf0c93739829088a71 (diff)
parent36837c4ad3f3c840791379db81d02b60d918c0f5 (diff)
Merge release-20190806.1-357-g36837c4 (automated)
-rw-r--r--runsc/main.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/runsc/main.go b/runsc/main.go
index ae906c661..711f60d4f 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -46,6 +46,8 @@ var (
logFormat = flag.String("log-format", "text", "log format: text (default), json, or json-k8s.")
debug = flag.Bool("debug", false, "enable debug logging.")
showVersion = flag.Bool("version", false, "show version and exit.")
+ // TODO(gvisor.dev/issue/193): support systemd cgroups
+ systemdCgroup = flag.Bool("systemd-cgroup", false, "Use systemd for cgroups. NOT SUPPORTED.")
// These flags are unique to runsc, and are used to configure parts of the
// system that are not covered by the runtime spec.
@@ -136,6 +138,12 @@ func main() {
os.Exit(0)
}
+ // TODO(gvisor.dev/issue/193): support systemd cgroups
+ if *systemdCgroup {
+ fmt.Fprintln(os.Stderr, "systemd cgroup flag passed, but systemd cgroups not supported. See gvisor.dev/issue/193")
+ os.Exit(1)
+ }
+
var errorLogger io.Writer
if *logFD > -1 {
errorLogger = os.NewFile(uintptr(*logFD), "error log file")