]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "options" rename in json bootctl output
authorLudwig Nussel <ludwig.nussel@suse.de>
Tue, 20 Feb 2024 13:25:12 +0000 (14:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 29 Feb 2024 17:07:14 +0000 (18:07 +0100)
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

index ceda70fb879eb131307c50c6553cffaa569f3114..9a1f5ab127d80943a208ce92bad6ba9aa634803c 100644 (file)
@@ -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;