From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 19 Jan 2025 15:43:14 +0000 (+0000)
Subject: ukify: pass through --json to systemd-measure
X-Git-Tag: v258-rc1~1546^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bf31680ad9a1148c9a5e1421661717641e68c59;p=thirdparty%2Fsystemd.git

ukify: pass through --json to systemd-measure

So that --measure --json prints usable json output
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 6b532437acb..b4070f3897b 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -763,6 +763,8 @@ def call_systemd_measure(uki: UKI, opts: UkifyConfig, profile_start: int = 0) ->
             cmd = [
                 measure_tool,
                 'calculate',
+                '--json',
+                opts.json,
                 *(f'--{s.name.removeprefix(".")}={s.content}' for s in to_measure.values()),
                 *(f'--bank={bank}' for bank in banks),
                 # For measurement, the keys are not relevant, so we can lump all the phase paths