UPdate vendor of image-spec and containers/storage

This should get rid of the nasty warning on the github site.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-12-02 14:03:47 -05:00
parent 4ff0ba4c87
commit ecd48325f6
13 changed files with 299 additions and 98 deletions

View File

@@ -77,6 +77,10 @@ const (
containersOverrideXattr = "user.containers.override_stat"
)
var xattrsToIgnore = map[string]interface{}{
"security.selinux": true,
}
// Archiver allows the reuse of most utility functions of this package with a
// pluggable Untar function. To facilitate the passing of specific id mappings
// for untar, an archiver can be created with maps which will then be passed to
@@ -743,6 +747,9 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
var errs []string
for key, value := range hdr.Xattrs {
if _, found := xattrsToIgnore[key]; found {
continue
}
if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
if errors.Is(err, syscall.ENOTSUP) || (inUserns && errors.Is(err, syscall.EPERM)) {
// We ignore errors here because not all graphdrivers support