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

admin: Assume we're using /ostree if there's a toplevel /usr 

Mainly so admin install works without an existing /ostree again.
This commit is contained in:
Colin Walters 2013-03-18 18:11:00 -04:00
parent e4faf0d98e
commit 7b2fc8df36
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ostree/ot-admin-builtin-install.c
View File

@ -96,6 +96,13 @@ ot_admin_builtin_install (int argc, char **argv, OtAdminBuiltinOpts *admin_opts,
goto out; goto out;
} }
if (admin_opts->ostree_dir == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"No existing /ostree found; use --ostree-dir");
goto out;
}
if (!ot_admin_ensure_initialized (admin_opts->ostree_dir, cancellable, error)) if (!ot_admin_ensure_initialized (admin_opts->ostree_dir, cancellable, error))
goto out; goto out;

9
src/ostree/ot-admin-functions.c
View File

@ -440,6 +440,9 @@ ot_admin_get_default_ostree_dir (GFile **out_ostree_dir,
gboolean ret = FALSE; gboolean ret = FALSE;
gs_unref_object GFile *possible_ostree_dir = NULL; gs_unref_object GFile *possible_ostree_dir = NULL;
gs_unref_object GFile *ret_ostree_dir = NULL; gs_unref_object GFile *ret_ostree_dir = NULL;
gs_unref_object GFile *host_usr = NULL;
host_usr = g_file_new_for_path ("/usr");
if (ret_ostree_dir == NULL) if (ret_ostree_dir == NULL)
{ {
@ -452,7 +455,11 @@ ot_admin_get_default_ostree_dir (GFile **out_ostree_dir,
{ {
g_clear_object (&possible_ostree_dir); g_clear_object (&possible_ostree_dir);
possible_ostree_dir = g_file_new_for_path ("/ostree"); possible_ostree_dir = g_file_new_for_path ("/ostree");
if (g_file_query_exists (possible_ostree_dir, NULL)) /* If there's also /usr, we assume we're outside an ostree root
* and thus should use /ostree.
*/
if (g_file_query_exists (possible_ostree_dir, NULL) ||
g_file_query_exists (host_usr, NULL))
ret_ostree_dir = g_object_ref (possible_ostree_dir); ret_ostree_dir = g_object_ref (possible_ostree_dir);
} }