Skip to content

Commit

Permalink
stages/dmverity: make device objects more generic
Browse files Browse the repository at this point in the history
We need to pass loopback devices for these properties, but the schema
says that there will be a `path` property, so osbuild complains.

osbuild is right of course, but this definitely *did* work in an earlier
version, so something changed. Ideally, we'd narrow down here what
happened exactly, but at the same time this approach of just making the
property more generic matches what's done in e.g. the `zipl.inst` stage
where we also use a loopback device.

For reference, this is where we use this stage:

https://github.com/coreos/coreos-assembler/blob/ba45b296ec11734bafcae7728915016f17137a3d/src/osbuild-manifests/platform.qemu.ipp.yaml#L100-L119
  • Loading branch information
jlebon authored and mvo5 committed Sep 10, 2024
1 parent f3188e8 commit 66a0033
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions stages/org.osbuild.dmverity.meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,11 @@
"properties": {
"data_device": {
"type": "object",
"additionalProperties": false,
"required": [
"path"
],
"properties": {
"path": {
"type": "string"
}
}
"additionalProperties": true
},
"hash_device": {
"type": "object",
"additionalProperties": false,
"required": [
"path"
],
"properties": {
"path": {
"type": "string"
}
}
"additionalProperties": true
}
}
}
Expand Down

0 comments on commit 66a0033

Please sign in to comment.