mkosi: fix various TriggerMatch conditions

TriggerMatch is an AND by default, so when multiple
Release matches are defined, they need to be prefixed by '|'

diff --git 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
index 2977041fd98d5c567b3b4dad71796cf377074cf4..d22865feaef8cce32024ff6caaaa2bc340c93a06 100644 (file)
--- 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

diff --git a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf
index b680604f001d857f2afcc406678747c33a9977e5..7cc69182a11459ea3f52080a9071c0e38f39023b 100644 (file)
--- 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=

diff --git 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
index b680604f001d857f2afcc406678747c33a9977e5..7cc69182a11459ea3f52080a9071c0e38f39023b 100644 (file)
--- 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=

diff --git 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
index b680604f001d857f2afcc406678747c33a9977e5..7cc69182a11459ea3f52080a9071c0e38f39023b 100644 (file)
--- 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=