@@ -69,25 +69,25 @@ func NewLayerTypeManifest(manifest ispec.Manifest) (LayerType, error) {
69
69
return NewLayerType ("tar" , verity .VerityMetadataMissing )
70
70
}
71
71
72
+ _ , verityMetadataPresent := manifest .Layers [0 ].Annotations [verity .VerityRootHashAnnotation ]
73
+
72
74
switch manifest .Layers [0 ].MediaType {
73
75
case squashfs .BaseMediaTypeLayerSquashfs :
74
76
// older stackers generated media types without compression information
75
77
fallthrough
76
78
case squashfs .GenerateSquashfsMediaType (squashfs .GzipCompression ):
77
79
fallthrough
78
80
case squashfs .GenerateSquashfsMediaType (squashfs .ZstdCompression ):
79
- return NewLayerType ("squashfs" , verity .VerityMetadataMissing )
80
- case squashfs .GenerateSquashfsMediaType (squashfs .GzipCompression ):
81
- fallthrough
82
- case squashfs .GenerateSquashfsMediaType (squashfs .ZstdCompression ):
83
- return NewLayerType ("squashfs" , verity .VerityMetadataPresent )
81
+ return NewLayerType ("squashfs" , verity .VerityMetadata (verityMetadataPresent ))
84
82
case erofs .BaseMediaTypeLayerErofs :
85
83
// older stackers generated media types without compression information
86
84
fallthrough
87
85
case erofs .GenerateErofsMediaType (erofs .LZ4HCCompression ):
88
- return NewLayerType ("erofs" , verity .VerityMetadataMissing )
89
- case erofs .GenerateErofsMediaType (erofs .LZ4HCCompression ):
90
- return NewLayerType ("erofs" , verity .VerityMetadataPresent )
86
+ fallthrough
87
+ case erofs .GenerateErofsMediaType (erofs .LZ4Compression ):
88
+ fallthrough
89
+ case erofs .GenerateErofsMediaType (erofs .ZstdCompression ):
90
+ return NewLayerType ("erofs" , verity .VerityMetadata (verityMetadataPresent ))
91
91
case ispec .MediaTypeImageLayerGzip :
92
92
fallthrough
93
93
case ispec .MediaTypeImageLayer :
0 commit comments