From fef07889d38c55406d687c81b0b29e86532189dc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 9 Jul 2018 12:22:10 -0400 Subject: [PATCH] deploy: Fix overriding kernel args for staged deployments This is the inverse of https://github.com/ostreedev/ostree/pull/1558 aka commits cadece6c4f398ca61d21e497bd6e3fbb549f9cf6 and 3358698c86d80821d81443c906621c92672f99fb Needed to fix `rpm-ostree kargs` test suite with default staging; skipping a test here for now as eventually what we'll do is turn on the rpm-ostree suite fully here. Closes: #1677 Approved by: jlebon --- src/libostree/ostree-sysroot-deploy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index a4387ab2..8198e191 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -2853,7 +2853,7 @@ _ostree_sysroot_finalize_staged (OstreeSysroot *self, if (!glnx_unlinkat (AT_FDCWD, _OSTREE_SYSROOT_RUNSTATE_STAGED, 0, error)) return FALSE; - if (!sysroot_finalize_deployment (self, self->staged_deployment, NULL, merge_deployment, + if (!sysroot_finalize_deployment (self, self->staged_deployment, kargs, merge_deployment, cancellable, error)) return FALSE;