mirror of
https://github.com/containers/podman.git
synced 2025-11-30 18:18:18 +08:00
vendor: update c/{common,buildah} to main
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/buildah/util.go
generated
vendored
6
vendor/github.com/containers/buildah/util.go
generated
vendored
@@ -17,7 +17,7 @@ import (
|
||||
"github.com/containers/storage/pkg/reexec"
|
||||
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
rspec "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"github.com/opencontainers/selinux/go-selinux/label"
|
||||
"github.com/opencontainers/selinux/go-selinux"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@@ -154,9 +154,7 @@ func ReserveSELinuxLabels(store storage.Store, id string) error {
|
||||
return err
|
||||
}
|
||||
// Prevent different containers from using same MCS label
|
||||
if err := label.ReserveLabel(b.ProcessLabel); err != nil {
|
||||
return fmt.Errorf("reserving SELinux label %q: %w", b.ProcessLabel, err)
|
||||
}
|
||||
selinux.ReserveLabel(b.ProcessLabel)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user