From 1f162fb2b8f8049e8305c1f88ba906922ebcec51 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 27 Mar 2019 16:08:02 +0100 Subject: [PATCH] bump opencontainers/selinux to v1.2 Gbp-Pq: Name selinux-containerd_cri.patch --- .../github.com/containerd/cri/pkg/server/helpers.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go b/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go index 0605f408..64281654 100644 --- a/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go +++ b/containerd/vendor/github.com/containerd/cri/pkg/server/helpers.go @@ -34,7 +34,6 @@ import ( imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" - "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "golang.org/x/net/context" @@ -343,7 +342,12 @@ func initSelinuxOpts(selinuxOpt *runtime.SELinuxOption) (string, string, error) selinuxOpt.GetRole(), selinuxOpt.GetType(), selinuxOpt.GetLevel()) - return label.InitLabels(selinux.DupSecOpt(labelOpts)) + + options, err := label.DupSecOpt(labelOpts) + if err != nil { + return "", "", err + } + return label.InitLabels(options) } func checkSelinuxLevel(level string) (bool, error) { -- 2.30.2