From 9260ddc4695e9f3bc7bc1137a70e8ce056834c30 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 1 Aug 2014 08:54:17 -0400 Subject: [PATCH] deploy: Propertly append multiple kernel arguments with --karg-proc-cmdline We want to allow multiply specified arguments, as it's useful for things like console= and rd.lvm.lv. See: https://bugzilla.gnome.org/show_bug.cgi?id=721136 Reported-by: Dusty Mabe --- src/ostree/ot-admin-builtin-deploy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index b99497f..a99cc89 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -143,7 +143,7 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell g_strchomp (proc_cmdline); proc_cmdline_args = g_strsplit (proc_cmdline, " ", -1); - _ostree_kernel_args_replace_argv (kargs, proc_cmdline_args); + _ostree_kernel_args_append_argv (kargs, proc_cmdline_args); } else if (merge_deployment) { -- 1.8.3.1