From b4d1df01316c4871ac12e1fca4fb247c1b7bdc57 Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Wed, 8 Jul 2015 09:21:46 +0800
Subject: [PATCH] Add oom-kill-disable support for systemd

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 libcontainer/cgroups/systemd/apply_systemd.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
index b72242fbd..8c27f11ac 100644
--- a/libcontainer/cgroups/systemd/apply_systemd.go
+++ b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -505,6 +505,11 @@ func joinMemory(c *configs.Cgroup, pid int) error {
 			return err
 		}
 	}
+	if c.OomKillDisable {
+		if err := writeFile(path, "memory.oom_control", "1"); err != nil {
+			return err
+		}
+	}
 
 	if c.MemorySwappiness >= 0 && c.MemorySwappiness <= 100 {
 		err = writeFile(path, "memory.swappiness", strconv.FormatInt(c.MemorySwappiness, 10))