30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
From 41724557c12e4cba5110a3b260a4340db3fe48e1 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <41724557c12e4cba5110a3b260a4340db3fe48e1.1659958805.git.stefan@agner.ch>
|
||
|
|
In-Reply-To: <410089ea4bb8bf051a941febd087b0346b967a10.1659958805.git.stefan@agner.ch>
|
||
|
|
References: <410089ea4bb8bf051a941febd087b0346b967a10.1659958805.git.stefan@agner.ch>
|
||
|
|
From: Stefan Agner <stefan@agner.ch>
|
||
|
|
Date: Thu, 3 Mar 2022 15:59:27 +0100
|
||
|
|
Subject: [PATCH 04/11] Adress linter error
|
||
|
|
|
||
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||
|
|
---
|
||
|
|
libcontainer/specconv/spec_linux.go | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
|
||
|
|
index 555c39ca..d51ac5c5 100644
|
||
|
|
--- a/libcontainer/specconv/spec_linux.go
|
||
|
|
+++ b/libcontainer/specconv/spec_linux.go
|
||
|
|
@@ -723,7 +723,7 @@ func CreateCgroupConfig(opts *CreateOpts, defaultDevs []*devices.Device) (*confi
|
||
|
|
|
||
|
|
// In rootless containers, any attempt to make cgroup changes is likely to fail.
|
||
|
|
// libcontainer will validate this but ignores the error.
|
||
|
|
- var r *specs.LinuxResources = nil
|
||
|
|
+ var r *specs.LinuxResources
|
||
|
|
if spec.Linux != nil {
|
||
|
|
r = spec.Linux.Resources
|
||
|
|
if r != nil {
|
||
|
|
--
|
||
|
|
2.37.1
|
||
|
|
|