packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin: Propagate --boot-dir to subcommands 

Really, I should be using internal functions here...
This commit is contained in:
Colin Walters 2013-01-06 06:12:42 -05:00
parent ccfdf22bb8
commit 9795f4a67e
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgsystem

@ -1 +1 @@
Subproject commit a2519612547354033f0d513a174f336896776fa8 Subproject commit b4e8a2ae8684fab55efe74a7fd4b872c934475fd

1
src/ostree/ot-admin-builtin-deploy.c
View File

@ -598,6 +598,7 @@ do_update_kernel (OtAdminDeploy *self,
args = g_ptr_array_new (); args = g_ptr_array_new ();
ot_ptrarray_add_many (args, "ostree", "admin", ot_ptrarray_add_many (args, "ostree", "admin",
"--ostree-dir", gs_file_get_path_cached (self->ostree_dir), "--ostree-dir", gs_file_get_path_cached (self->ostree_dir),
"--boot-dir", gs_file_get_path_cached (self->admin_opts->boot_dir),
"update-kernel", "update-kernel",
self->osname, self->osname,
gs_file_get_path_cached (deploy_path), NULL); gs_file_get_path_cached (deploy_path), NULL);

5
src/ostree/ot-admin-builtin-pull-deploy.c
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=", ot_lfree char *opt_ostree_dir_arg = g_strconcat ("--ostree-dir=",
gs_file_get_path_cached (ostree_dir), gs_file_get_path_cached (ostree_dir),
NULL); 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), if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir),
GS_SUBPROCESS_STREAM_DISPOSITION_NULL, GS_SUBPROCESS_STREAM_DISPOSITION_NULL,
cancellable, error, 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)) deploy_name, NULL))
goto out; goto out;
} }