diff options
| author | Colin Walters <walters@verbum.org> | 2014-08-03 14:32:52 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-08-03 14:34:28 -0400 |
| commit | 82fb07e4ae756aac2dc32f50ff75ad84dce223c0 (patch) | |
| tree | b1c90a7ea74f4f1c582c81d3553c44d64841d959 /src/ostree/ot-admin-builtin-deploy.c | |
| parent | 22bd6d9102ab2bb3f003aa392c95d1f6200fdfa7 (diff) | |
| download | ostree-82fb07e4ae756aac2dc32f50ff75ad84dce223c0.tar.gz | |
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>
Diffstat (limited to 'src/ostree/ot-admin-builtin-deploy.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-deploy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index a99cc89e..a209c26f 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -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) |