admin: Propagate --boot-dir to subcommands

Really, I should be using internal functions here...
This commit is contained in:
Colin Walters committed 2013-01-06 06:12:42 -05:00
1 parent ccfdf22bb8
commit 9795f4a67e
3 files changed
+6 -2

No files matched your search

+1
View File
@@ -598,6 +598,7 @@ do_update_kernel (OtAdminDeploy *self,
args = g_ptr_array_new ();
ot_ptrarray_add_many (args, "ostree", "admin",
"--ostree-dir", gs_file_get_path_cached (self->ostree_dir),
"--boot-dir", gs_file_get_path_cached (self->admin_opts->boot_dir),
"update-kernel",
self->osname,
gs_file_get_path_cached (deploy_path), NULL);
+4 -1
View File
@@ -116,10 +116,13 @@ ot_admin_builtin_pull_deploy (int argc, char **argv, OtAdminBuiltinOpts *admin_o
ot_lfree char *opt_ostree_dir_arg = g_strconcat ("--ostree-dir=",
gs_file_get_path_cached (ostree_dir),
NULL);
ot_lfree char *opt_boot_dir_arg = g_strconcat ("--boot-dir=",
gs_file_get_path_cached (admin_opts->boot_dir),
NULL);
if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir),
GS_SUBPROCESS_STREAM_DISPOSITION_NULL,
cancellable, error,
"ostree", "admin", opt_ostree_dir_arg, "deploy", osname,
"ostree", "admin", opt_ostree_dir_arg, opt_boot_dir_arg, "deploy", osname,
deploy_name, NULL))
goto out;
}