From 8094649c861a0b6ca408caa38611f3e235378206 Mon Sep 17 00:00:00 2001
From: zhangsong34 <zhangsong34@huawei.com>
Date: Mon, 5 Mar 2018 21:15:15 +0800
Subject: [PATCH] runc:do not setup sysctl in runc when userns enable

reason:when userns enabled, runc will run as normal user, it has
no rights to setup sysctl even the ipcns sysctl. let docker-hooks do this job.

Change-Id: Ia77b8c1bf4255973736f04c0962eae722ed9683e
Signed-off-by: gus.gao <gus.gao@huawei.com>
Signed-off-by: zhangsong34 <zhangsong34@huawei.com>
---
 libcontainer/standard_init_linux.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go
index 84883c2..542edba 100644
--- a/libcontainer/standard_init_linux.go
+++ b/libcontainer/standard_init_linux.go
@@ -130,10 +130,12 @@ func (l *linuxStandardInit) Init() error {
 	if err := apparmor.ApplyProfile(l.config.AppArmorProfile); err != nil {
 		return fmt.Errorf("unable to apply apparmor profile: %w", err)
 	}
-
-	for key, value := range l.config.Config.Sysctl {
-		if err := writeSystemProperty(key, value); err != nil {
-			return err
+	// when userns enabled, write to sysctl will fail, let docker-hooks do this job
+	if len(l.config.Config.UidMappings) == 0 && len(l.config.Config.GidMappings) == 0 {
+		for key, value := range l.config.Config.Sysctl {
+			if err := writeSystemProperty(key, value); err != nil {
+				return err
+			}
 		}
 	}
 	for _, path := range l.config.Config.ReadonlyPaths {
-- 
2.33.0

