mkosi: fix various TriggerMatch conditions

TriggerMatch is an AND by default, so when multiple Release matches are defined, they need to be prefixed by '|'
2026-06-24 08:47:49 +00:00 · 2026-06-04 15:40:27 +01:00
parent 936a790847
commit 10f8544727
4 changed files with 12 additions and 12 deletions
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf
@@ -2,15 +2,15 @@

 [TriggerMatch]
 Distribution=debian
-Release=bullseye
-Release=bookworm
-Release=trixie
+Release=|bullseye
+Release=|bookworm
+Release=|trixie

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
-Release=questing
+Release=|jammy
+Release=|noble
+Release=|questing

 [Content]
 Packages=isc-dhcp-server
--- a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=
--- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=
--- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
+++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
@@ -2,8 +2,8 @@

 [TriggerMatch]
 Distribution=ubuntu
-Release=jammy
-Release=noble
+Release=|jammy
+Release=|noble

 [Content]
 Packages=