vendor: update c/{common,buildah} to main

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-03-24 16:51:40 +01:00
parent 999a11c8b1
commit f5fbb4215d
30 changed files with 55 additions and 10180 deletions

View File

@@ -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