SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "options" rename in json bootctl output

Browse Source 
Revert the rename from "options" to "finalCmdline" in 122650b4a0
while the bigger https://github.com/systemd/systemd/pull/31339 is still
under review.
This commit is contained in:
Ludwig Nussel
2024-02-29 18:07:14 +01:00
committed by Lennart Poettering
parent 9b61d422ff
commit 33f23e2230
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bootspec.c
+2 -2
View 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;