From: Wolfgang Bumiller <w.bumiller@errno.eu>
Date: Thu, 4 Jun 2026 15:07:22 +0000 (+0200)
Subject: ukify: honor UKI/SBAT from config files
X-Git-Tag: v261~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=345acde398611a24910fefa80c957fcbb6fc61d0;p=thirdparty%2Fsystemd.git

ukify: honor UKI/SBAT from config files

`UkifyConfig.sbat` is an optional list, so the default of
`config_set_if_unset` would only accept a single value.

Further, it is defined with an empty list as a default, causing
configuration values to always be ignored, as the default is not
`None`.

Set its `config_push` to `ConfigItem.config_list_prepend` to collect
the `SBAT` lines from the config.

Signed-off-by: Wolfgang Bumiller <w.bumiller@errno.eu>
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 59078c98aad..7e3dd9038cb 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -2018,6 +2018,7 @@ CONFIG_ITEMS = [
         default=[],
         action='append',
         config_key='UKI/SBAT',
+        config_push=ConfigItem.config_list_prepend,
     ),
     ConfigItem(
         '--pcrpkey',