diff options
| author | Colin Walters <walters@verbum.org> | 2014-01-16 13:04:00 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-01-16 15:07:55 -0500 |
| commit | b2d0ba7ac1e742586eeb3018d88e01dc436d5b4d (patch) | |
| tree | 01abcbdef606c1587e9a3ade713a08511debdd89 /src/ostree/ot-admin-builtin-upgrade.c | |
| parent | 7db2031fa06621d0564f859776e072130d49a867 (diff) | |
| download | ostree-b2d0ba7ac1e742586eeb3018d88e01dc436d5b4d.tar.gz | |
deploy: Rework kernel arguments, add --karg-append to "admin deploy"
The "ordered hash" code was really just for kernel arguments. And it
turns out it needs to be a multihash (for e.g. multiple console=
arguments).
So turn the OstreeOrderedHash into OstreeKernelArgs, and move the bits
to split key=value and such into there.
Now we're not making this public API yet - the public OstreeSysroot
just takes char **kargs. To facilitate code reuse between ostree/ and
libostree/, make it a noinst libtool library. It'll be duplicated in
the binary and library, but that's OK for now. We can investigate
making OstreeKernelArgs public later.
https://bugzilla.gnome.org/show_bug.cgi?id=721136
Diffstat (limited to 'src/ostree/ot-admin-builtin-upgrade.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-upgrade.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 299c6a81..d222e9e0 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -147,12 +147,12 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel goto out; } - if (!ostree_sysroot_deploy_one_tree (sysroot, - opt_osname, new_revision, origin, - NULL, - merge_deployment, - &new_deployment, - cancellable, error)) + if (!ostree_sysroot_deploy_tree (sysroot, + opt_osname, new_revision, origin, + merge_deployment, + NULL, + &new_deployment, + cancellable, error)) goto out; if (!ot_admin_complete_deploy_one (sysroot, opt_osname, |