Merge pull request #851 from nalind/check-lgetxattr

chown: ignore both pkg/system.EOPNOTSUPP and pkg/system.ErrNotSupportedPlatform
containers · Mar 11, 2021 · 3c13812 · 3c13812
2 parents 7df1ede + da8b28a
commit 3c13812
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/chown_unix.go b/drivers/chown_unix.go
@@ -3,6 +3,7 @@
 package graphdriver
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"syscall"
@@ -49,7 +50,7 @@ func platformLChown(path string, info os.FileInfo, toHost, toContainer *idtools.
 	}
 	if uid != int(st.Uid) || gid != int(st.Gid) {
 		cap, err := system.Lgetxattr(path, "security.capability")
-		if err != nil && err != system.ErrNotSupportedPlatform {
+		if err != nil && !errors.Is(err, system.EOPNOTSUPP) && err != system.ErrNotSupportedPlatform {
 			return fmt.Errorf("%s: %v", os.Args[0], err)
 		}