Merge pull request #1931 from akihikodaki/main

archive: always fix mode for root dir with ForceMask
containers · Jun 3, 2024 · 5310107 · 5310107
2 parents 5fe400b + 96545b8
commit 5310107
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go
@@ -1113,8 +1113,11 @@ loop:
 		}
 	}
 
-	if options.ForceMask != nil && rootHdr != nil {
-		value := fmt.Sprintf("%d:%d:0%o", rootHdr.Uid, rootHdr.Gid, rootHdr.Mode)
+	if options.ForceMask != nil {
+		value := "0:0:0755"
+		if rootHdr != nil {
+			value = fmt.Sprintf("%d:%d:0%o", rootHdr.Uid, rootHdr.Gid, rootHdr.Mode)
+		}
 		if err := system.Lsetxattr(dest, idtools.ContainersOverrideXattr, []byte(value), 0); err != nil {
 			return err
 		}