summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-07-30 17:21:53 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-07-30 17:21:53 -0400
commit899d0b1c97f6b545ac04e2659fc9cb3b27778bbd (patch)
treeb0b68d4ecd62640b53eb8c75bd1504e012bc3c20
parent07af5f9aa8e4786d374c8099de7e972e56e545a1 (diff)
these changes were sitting herewip/sd_login
-rw-r--r--sd_login/notes.org3
-rw-r--r--sd_login/systemd_cgroup.go2
2 files changed, 3 insertions, 2 deletions
diff --git a/sd_login/notes.org b/sd_login/notes.org
index 38e866b..91a237a 100644
--- a/sd_login/notes.org
+++ b/sd_login/notes.org
@@ -38,7 +38,8 @@ tree, where the unit matches either `user@UID.service` or
A container may nest its cgroup tree inside of a unit also. Because
the container will have its own PID namespace, it will have its own
PID 1, and be able to inspect the cgroup of PID 1, just as the host
-system does.
+system does (though it is probably wiser to use cgroup namespaces to
+make it appear that the prefix is the root).
| Thing | | |
diff --git a/sd_login/systemd_cgroup.go b/sd_login/systemd_cgroup.go
index 6c64525..5f25231 100644
--- a/sd_login/systemd_cgroup.go
+++ b/sd_login/systemd_cgroup.go
@@ -61,7 +61,7 @@ func cgVersion() uint {
// is obvious.
//
// However, in cgroup v1, there were multiple cgroup hierarchies, so
-// this function must decide which hierarchy to use. We chooses the
+// this function must decide which hierarchy to use. We choose the
// first hierarchy with either the "name=systemd" controller or the
// "name=elogind" controller attached to it[1]. If no such hierarchy
// exists, then an error is returned.