From 10f8544727a9fcdc0580420c475f459be40586ef Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 4 Jun 2026 15:40:27 +0100
Subject: [PATCH] mkosi: fix various TriggerMatch conditions

TriggerMatch is an AND by default, so when multiple
Release matches are defined, they need to be prefixed by '|'
---
 .../debian-ubuntu/mkosi.conf.d/isc-dhcp.conf         | 12 ++++++------
 .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf  |  4 ++--
 .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf  |  4 ++--
 .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

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 2977041fd9..d22865feae 100644
--- 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 b680604f00..7cc69182a1 100644
--- 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 b680604f00..7cc69182a1 100644
--- 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 b680604f00..7cc69182a1 100644
--- 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=