From 33f23e2230463aabeb2b2dd768d9efb397232e70 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 20 Feb 2024 14:25:12 +0100 Subject: [PATCH] Revert "options" rename in json bootctl output Revert the rename from "options" to "finalCmdline" in 122650b4a0 while the bigger https://github.com/systemd/systemd/pull/31339 is still under review. --- src/shared/bootspec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index ceda70fb879..9a1f5ab127d 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -1484,7 +1484,7 @@ static int print_cmdline( } if (final_cmdline) - printf(" finalCmdline: %s\n", final_cmdline); + printf(" options: %s\n", final_cmdline); return 0; } @@ -1544,7 +1544,7 @@ static int json_cmdline( v, JSON_BUILD_OBJECT( JSON_BUILD_PAIR_CONDITION(def_cmdline, "ukiCmdline", JSON_BUILD_STRING(def_cmdline)), JSON_BUILD_PAIR("addons", JSON_BUILD_VARIANT(addons_array)), - JSON_BUILD_PAIR_CONDITION(final_cmdline, "finalCmdline", JSON_BUILD_STRING(final_cmdline)))); + JSON_BUILD_PAIR_CONDITION(final_cmdline, "options", JSON_BUILD_STRING(final_cmdline)))); if (r < 0) return log_oom(); return 0; -- 2.47.3