mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-16 14:52:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker-runc: adapt patches for runc 1.0.0-rc91

Browse Source 
To fix builds, adapt patches for runc 1.0.0-rc91.
This commit is contained in:
Dongsu Park 2020-07-09 10:51:41 +02:00 committed by Kai Lüke
parent 63adddc590
commit e6b8d5175a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/files/0001-temporarily-disable-selinux.GetEnabled-error-checks.patch vendored
View File

@ -26,7 +26,7 @@ index 3b42f301..bace067d 100644
return fmt.Errorf("unable to restrict sys entries without a private MNT namespace") return fmt.Errorf("unable to restrict sys entries without a private MNT namespace")
} }
- if config.ProcessLabel != "" && !selinux.GetEnabled() { - if config.ProcessLabel != "" && !selinux.GetEnabled() {
- return fmt.Errorf("selinux label is specified in config, but selinux is disabled or not supported") - return errors.New("selinux label is specified in config, but selinux is disabled or not supported")
- } - }
return nil return nil
@ -41,14 +41,14 @@ index b05e7b60..ce50db14 100644
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
- selinux "github.com/opencontainers/selinux/go-selinux" - selinux "github.com/opencontainers/selinux/go-selinux"
"github.com/coreos/go-systemd/activation" "github.com/coreos/go-systemd/v22/activation"
"github.com/pkg/errors" "github.com/pkg/errors"
@@ -388,9 +387,6 @@ func validateProcessSpec(spec *specs.Process) error { @@ -388,9 +387,6 @@ func validateProcessSpec(spec *specs.Process) error {
if len(spec.Args) == 0 { if len(spec.Args) == 0 {
return fmt.Errorf("args must not be empty") return fmt.Errorf("args must not be empty")
} }
- if spec.SelinuxLabel != "" && !selinux.GetEnabled() { - if spec.SelinuxLabel != "" && !selinux.GetEnabled() {
- return fmt.Errorf("selinux label is specified in config, but selinux is disabled or not supported") - return errors.New("selinux label is specified in config, but selinux is disabled or not supported")
- } - }
return nil return nil
} }