41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From 28daf0653d324fad545a7031e64b6891f399969b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kir Kolyshkin <kolyshkin@gmail.com>
|
||
|
|
Date: Tue, 23 Feb 2021 17:58:07 -0800
|
||
|
|
Subject: [PATCH 1/5] libct/newInitConfig: nit
|
||
|
|
|
||
|
|
Move the initialization of Console* fields as they are unconditional.
|
||
|
|
|
||
|
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
||
|
|
---
|
||
|
|
libcontainer/container_linux.go | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
|
||
|
|
index 3dca29e4c3f2..b6100aae9d5a 100644
|
||
|
|
--- a/libcontainer/container_linux.go
|
||
|
|
+++ b/libcontainer/container_linux.go
|
||
|
|
@@ -594,6 +594,9 @@ func (c *linuxContainer) newInitConfig(process *Process) *initConfig {
|
||
|
|
AppArmorProfile: c.config.AppArmorProfile,
|
||
|
|
ProcessLabel: c.config.ProcessLabel,
|
||
|
|
Rlimits: c.config.Rlimits,
|
||
|
|
+ CreateConsole: process.ConsoleSocket != nil,
|
||
|
|
+ ConsoleWidth: process.ConsoleWidth,
|
||
|
|
+ ConsoleHeight: process.ConsoleHeight,
|
||
|
|
}
|
||
|
|
if process.NoNewPrivileges != nil {
|
||
|
|
cfg.NoNewPrivileges = *process.NoNewPrivileges
|
||
|
|
@@ -607,9 +610,7 @@ func (c *linuxContainer) newInitConfig(process *Process) *initConfig {
|
||
|
|
if len(process.Rlimits) > 0 {
|
||
|
|
cfg.Rlimits = process.Rlimits
|
||
|
|
}
|
||
|
|
- cfg.CreateConsole = process.ConsoleSocket != nil
|
||
|
|
- cfg.ConsoleWidth = process.ConsoleWidth
|
||
|
|
- cfg.ConsoleHeight = process.ConsoleHeight
|
||
|
|
+
|
||
|
|
return cfg
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|