particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*.unit.create.meta.json: Fix syntax for not-required checks

Browse source 
not required [A, B] is not right as it means its not required to have
both. Instead we want not any-of [ required: a, required: b ]
This commit is contained in:
Alexander Larsson 2024-09-17 16:16:46 +02:00 • committed by Simon de Vlieger
parent e7699e0c70
commit 2393299510
2 changed files with 66 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
stages/org.osbuild.containers.unit.create.meta.json
View file

@ -78,10 +78,17 @@
"Install" "Install"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Service", {
"Volume", "required": [
"Network" "Volume"
]
},
{
"required": [
"Network"
]
}
] ]
} }
}, },
@ -90,10 +97,17 @@
"Volume" "Volume"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Container", {
"Network", "required": [
"Service" "Container"
]
},
{
"required": [
"Network"
]
}
] ]
} }
}, },
@ -102,10 +116,17 @@
"Network" "Network"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Service", {
"Container", "required": [
"Volume" "Container"
]
},
{
"required": [
"Volume"
]
}
] ]
} }
} }
@ -247,9 +268,6 @@
"additionalProperties": false, "additionalProperties": false,
"type": "object", "type": "object",
"description": "'Volume' configuration section of a unit file.", "description": "'Volume' configuration section of a unit file.",
"required": [
"What"
],
"properties": { "properties": {
"VolumeName": { "VolumeName": {
"description": "Override volume name", "description": "Override volume name",

42
stages/org.osbuild.systemd.unit.create.meta.json
View file

@ -90,9 +90,17 @@
"Install" "Install"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Mount", {
"Socket" "required": [
"Mount"
]
},
{
"required": [
"Socket"
]
}
] ]
} }
}, },
@ -101,9 +109,17 @@
"Socket" "Socket"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Mount", {
"Service" "required": [
"Mount"
]
},
{
"required": [
"Service"
]
}
] ]
} }
}, },
@ -112,9 +128,17 @@
"Mount" "Mount"
], ],
"not": { "not": {
"required": [ "anyOf": [
"Service", {
"Socket" "required": [
"Service"
]
},
{
"required": [
"Socket"
]
}
] ]
} }
} }