Skip to content

Commit

Permalink
rpmostree: Use --merge for kargs
Browse files Browse the repository at this point in the history
Without `--merge`, all kernel arguments will be replaced, which is
not what is desired in general. Especially with bootc karg support
which we definitely want to work with Anaconda.

Signed-off-by: Colin Walters <[email protected]>
  • Loading branch information
cgwalters committed Jan 7, 2025
1 parent 915bc1d commit 2bb5ba2
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def _set_kargs(self):
device_tree.GetDeviceData(root_id)
)

set_kargs_args = ["admin", "instutil", "set-kargs"]
set_kargs_args = ["admin", "instutil", "set-kargs", "--merge"]
set_kargs_args.extend(bootloader.GetArguments())
set_kargs_args.append("root=" + device_tree.GetFstabSpec(root_id))
set_kargs_args.append("vconsole.keymap=" + localization.VirtualConsoleKeymap)
Expand Down

0 comments on commit 2bb5ba2

Please sign in to comment.