deploy: Also honor multiply-specified kernel args with existing config
If we deployed a new tree inside an existing OS, inheriting kernel args, we need to use append() instead of replace() to avoid collapsing multiply specified kernel arguments like console=/dev/foo console=/dev/bar. Reported-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
1 parent
22bd6d9102
commit
82fb07e4ae
2 files changed
+16
-1
No files matched your search
@@ -150,7 +150,7 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell
|
||||
OstreeBootconfigParser *bootconfig = ostree_deployment_get_bootconfig (merge_deployment);
|
||||
gs_strfreev char **previous_args = g_strsplit (ostree_bootconfig_parser_get (bootconfig, "options"), " ", -1);
|
||||
|
||||
_ostree_kernel_args_replace_argv (kargs, previous_args);
|
||||
_ostree_kernel_args_append_argv (kargs, previous_args);
|
||||
}
|
||||
|
||||
if (opt_kernel_argv)
|
||||
|
||||
Reference in new issue
Block a user