diff options
| author | Colin Walters <walters@verbum.org> | 2013-09-15 20:16:20 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-09-15 20:16:20 -0400 |
| commit | c6292942ff3d284f9a8056c314bf1ffbf45278ae (patch) | |
| tree | 9b6a624933b00626420bff6fd56fb1ac2b8b47a5 /src/ostree/ot-admin-builtin-deploy.c | |
| parent | 95f07d486adcb6bb12d8da0016066d8d8db205d6 (diff) | |
| download | ostree-c6292942ff3d284f9a8056c314bf1ffbf45278ae.tar.gz | |
libostree: Nearly complete move of API into OstreeSysroot
Move the deployment code too.
Diffstat (limited to 'src/ostree/ot-admin-builtin-deploy.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-deploy.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index 883f77af..6e5cc601 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -24,8 +24,6 @@ #include "ot-admin-builtins.h" #include "ot-admin-functions.h" -#include "ot-admin-deploy.h" -#include "ot-ordered-hash.h" #include "ostree.h" #include "otutil.h" @@ -90,10 +88,10 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell /* Find the currently booted deployment, if any; we will ensure it * is present in the new deployment list. */ - if (!ot_admin_require_deployment_or_osname (ostree_sysroot_get_path (sysroot), current_deployments, - opt_osname, - &booted_deployment, - cancellable, error)) + if (!ostree_sysroot_require_deployment_or_osname (sysroot, current_deployments, + opt_osname, + &booted_deployment, + cancellable, error)) { g_prefix_error (error, "Looking for booted deployment: "); goto out; @@ -114,12 +112,12 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell if (!ostree_repo_resolve_rev (repo, refspec, FALSE, &revision, error)) goto out; - if (!ot_admin_deploy (ostree_sysroot_get_path (sysroot), current_bootversion, current_deployments, - opt_osname, revision, origin, - opt_kernel_argv, opt_retain, - booted_deployment, NULL, - &new_deployment, &new_bootversion, &new_deployments, - cancellable, error)) + if (!ostree_sysroot_deploy (sysroot, current_bootversion, current_deployments, + opt_osname, revision, origin, + opt_kernel_argv, opt_retain, + booted_deployment, NULL, + &new_deployment, &new_bootversion, &new_deployments, + cancellable, error)) goto out; ret = TRUE; |