[ostree] admin: Propagate --boot-dir to subcommands

[Colin Walters <walters src gnome org>]

commit 9795f4a67e281bcd1192c1517885ed7f9eab1827
Author: Colin Walters <walters verbum org>
Date:   Sun Jan 6 06:12:42 2013 -0500

    admin: Propagate --boot-dir to subcommands
    
    Really, I should be using internal functions here...

 src/libgsystem                            |    2 +-
 src/ostree/ot-admin-builtin-deploy.c      |    1 +
 src/ostree/ot-admin-builtin-pull-deploy.c |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/libgsystem b/src/libgsystem
index a251961..b4e8a2a 160000
--- a/src/libgsystem
+++ b/src/libgsystem
@@ -1 +1 @@
-Subproject commit a2519612547354033f0d513a174f336896776fa8
+Subproject commit b4e8a2ae8684fab55efe74a7fd4b872c934475fd
diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index ffe9f28..9d4a1b3 100644
--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
@@ -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);
diff --git a/src/ostree/ot-admin-builtin-pull-deploy.c b/src/ostree/ot-admin-builtin-pull-deploy.c
index 1333f41..2fd3cd4 100644
--- a/src/ostree/ot-admin-builtin-pull-deploy.c
+++ b/src/ostree/ot-admin-builtin-pull-deploy.c
@@ -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;
   }