diff options
| author | Ludwig Nussel <ludwig.nussel@suse.de> | 2024-02-20 14:25:12 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-02-29 18:07:14 +0100 |
| commit | 33f23e2230463aabeb2b2dd768d9efb397232e70 (patch) | |
| tree | eec14e07bf84785222f74f47916aada26e802a14 /src/shared/bootspec.c | |
| parent | Merge pull request #31430 from CodethinkLabs/vmspawn/machinectl_vmspawn_support (diff) | |
| download | systemd-33f23e2230463aabeb2b2dd768d9efb397232e70.tar.xz systemd-33f23e2230463aabeb2b2dd768d9efb397232e70.zip | |
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.
Diffstat (limited to 'src/shared/bootspec.c')
| -rw-r--r-- | src/shared/bootspec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index ceda70fb87..9a1f5ab127 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; |