keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

treecompose: Make use of cachedir again (just for metadata)

Browse Source 
We need to do selinux first.
This commit is contained in:
Colin Walters 2016-02-10 13:47:32 +01:00
parent 58cf2c9403
commit 592f889a10
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/rpmostree-compose-builtin-tree.c
View File

@ -88,6 +88,7 @@ typedef struct {
GFile *workdir;
int workdir_dfd;
int cachedir_dfd;
OstreeRepo *repo;
char *ref;
char *previous_checksum;
@ -188,7 +189,20 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
g_autoptr(GKeyFile) treespec = g_key_file_new ();
JsonArray *enable_repos = NULL;
ctx = rpmostree_context_new_unprivileged (self->workdir_dfd, cancellable, error);
/* TODO - uncomment this once we have SELinux working */
#if 0
g_autofree char *cache_repo_pathstr = glnx_fdrel_abspath (self->cachedir_dfd, "repo");
g_autoptr(GFile) cache_repo_path = g_file_new_for_path (cache_repo_pathstr);
glnx_unref_object OstreeRepo *ostreerepo = ostree_repo_new (cache_repo_path);
if (!g_file_test (cache_repo_pathstr, G_FILE_TEST_EXISTS))
{
if (!ostree_repo_create (ostreerepo, OSTREE_REPO_MODE_BARE_USER, cancellable, error))
goto out;
}
#endif
ctx = rpmostree_context_new_unprivileged (self->cachedir_dfd, cancellable, error);
if (!ctx)
goto out;
hifctx = rpmostree_context_get_hif (ctx);
@ -497,7 +511,6 @@ rpmostree_compose_builtin_tree (int argc,
JsonObject *treefile = NULL;
gs_free char *cachekey = NULL;
gs_free char *new_inputhash = NULL;
gs_unref_object GFile *cachedir = NULL;
gs_unref_object GFile *previous_root = NULL;
gs_free char *previous_checksum = NULL;
gs_unref_object GFile *yumroot = NULL;
@ -581,9 +594,20 @@ rpmostree_compose_builtin_tree (int argc,
if (opt_cachedir)
{
cachedir = g_file_new_for_path (opt_cachedir);
if (!gs_file_ensure_directory (cachedir, FALSE, cancellable, error))
goto out;
if (!glnx_opendirat (AT_FDCWD, opt_cachedir, TRUE, &self->cachedir_dfd, error))
{
g_prefix_error (error, "Opening cachedir '%s': ", opt_cachedir);
goto out;
}
}
else
{
self->cachedir_dfd = fcntl (self->workdir_dfd, F_DUPFD_CLOEXEC, 3);
if (self->cachedir_dfd < 0)
{
glnx_set_error_from_errno (error);
goto out;
}
}
if (opt_metadata_strings)