From b9e26ad8c6fc6f131d100b40f5bb46102bcf8a18 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 19 Sep 2020 10:45:38 +0200 Subject: [PATCH] libcontainer: remove workaround for RHEL6 kernels This was a workaround for RHEL6 (2.6.xx) kernels, which have not been supported by container runtimes for a long time, so should be safe to remove this workaround. Signed-off-by: Sebastiaan van Stijn --- libcontainer/capabilities_linux.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libcontainer/capabilities_linux.go b/libcontainer/capabilities_linux.go index 2996fef41..a74c32efd 100644 --- a/libcontainer/capabilities_linux.go +++ b/libcontainer/capabilities_linux.go @@ -16,13 +16,8 @@ var capabilityMap map[string]capability.Cap func init() { capabilityMap = make(map[string]capability.Cap) - last := capability.CAP_LAST_CAP - // workaround for RHEL6 which has no /proc/sys/kernel/cap_last_cap - if last == capability.Cap(63) { - last = capability.CAP_BLOCK_SUSPEND - } for _, c := range capability.List() { - if c > last { + if c > capability.CAP_LAST_CAP { continue } capKey := fmt.Sprintf("CAP_%s", strings.ToUpper(c.String()))