Merge pull request #1323 from rhatdan/main

Don't fail on walking os of EOPNOTSUPP for Llistxatt
containers · Sep 7, 2022 · 5aff7f6 · 5aff7f6
2 parents abfc271 + 03698d4
commit 5aff7f6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/drivers/overlay/check_116.go b/drivers/overlay/check_116.go
@@ -1,14 +1,17 @@
-// +build go1.16
+//go:build linux
+// +build linux
 
 package overlay
 
 import (
+	"errors"
 	"io/fs"
 	"path/filepath"
 	"strings"
 
 	"github.com/containers/storage/pkg/archive"
 	"github.com/containers/storage/pkg/system"
+	"golang.org/x/sys/unix"
 )
 
 func scanForMountProgramIndicators(home string) (detected bool, err error) {
@@ -26,7 +29,7 @@ func scanForMountProgramIndicators(home string) (detected bool, err error) {
 		}
 		if d.IsDir() {
 			xattrs, err := system.Llistxattr(path)
-			if err != nil {
+			if err != nil && !errors.Is(err, unix.EOPNOTSUPP) {
 				return err
 			}
 			for _, xattr := range xattrs {