From 57a8c2e5e844ee403c9a703c621780de7c7343f0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 15 Oct 2018 15:42:12 -0400 Subject: Mount proper cgroup for systemd to manage inside of the container. We are still requiring oci-systemd-hook to be installed in order to run systemd within a container. This patch properly mounts /sys/fs/cgroup/systemd/libpod_parent/libpod-UUID on /sys/fs/cgroup/systemd inside of container. Since we need the UUID of the container, we needed to move Systemd to be a config option of the container. Signed-off-by: Daniel J Walsh --- libpod/container_easyjson.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'libpod/container_easyjson.go') diff --git a/libpod/container_easyjson.go b/libpod/container_easyjson.go index f78366065..53ad5b7ee 100644 --- a/libpod/container_easyjson.go +++ b/libpod/container_easyjson.go @@ -1682,6 +1682,8 @@ func easyjson1dbef17bDecodeGithubComContainersLibpodLibpod2(in *jlexer.Lexer, ou } case "pause": out.IsInfra = bool(in.Bool()) + case "systemd": + out.Systemd = bool(in.Bool()) default: in.SkipRecursive() } @@ -2344,6 +2346,16 @@ func easyjson1dbef17bEncodeGithubComContainersLibpodLibpod2(out *jwriter.Writer, } out.Bool(bool(in.IsInfra)) } + { + const prefix string = ",\"systemd\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.Bool(bool(in.Systemd)) + } out.RawByte('}') } -- cgit v1.2.3-54-g00ecf