Revert "Update runc to 1.0.0"

This commit is contained in:
Odin Ugedal
2021-07-05 14:03:04 +02:00
committed by GitHub
parent 5e3bed6399
commit 61d88af9e4
146 changed files with 1196 additions and 2702 deletions

View File

@@ -16,9 +16,9 @@ import (
"strings"
"sync"
"github.com/bits-and-blooms/bitset"
"github.com/opencontainers/selinux/pkg/pwalk"
"github.com/pkg/errors"
"github.com/willf/bitset"
"golang.org/x/sys/unix"
)
@@ -892,13 +892,13 @@ func openContextFile() (*os.File, error) {
return os.Open(lxcPath)
}
var labels, privContainerMountLabel = loadLabels()
var labels = loadLabels()
func loadLabels() (map[string]string, string) {
func loadLabels() map[string]string {
labels := make(map[string]string)
in, err := openContextFile()
if err != nil {
return labels, ""
return labels
}
defer in.Close()
@@ -920,10 +920,7 @@ func loadLabels() (map[string]string, string) {
}
}
con, _ := NewContext(labels["file"])
con["level"] = fmt.Sprintf("s0:c%d,c%d", maxCategory-2, maxCategory-1)
reserveLabel(con.get())
return labels, con.get()
return labels
}
// kvmContainerLabels returns the default processLabel and mountLabel to be used