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

Merge pull request #84 from cgwalters/fd-relative-xattrs

Browse Source 
compose: Use *at() relative lookups for xattrs
This commit is contained in:
Colin Walters 2015-01-06 09:11:37 -05:00
commit 8e7c75968d
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -42,7 +42,9 @@ AC_SUBST(CAP_LIBS)
LIBS="$save_LIBS" LIBS="$save_LIBS"
PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0]) PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 json-glib-1.0 ostree-1 >= 2014.13 libgsystem rpm hawkey]) PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 json-glib-1.0
ostree-1 >= 2014.13 libgsystem >= 2014.3
rpm hawkey])
AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([XSLTPROC], [xsltproc])
GLIB_TESTS GLIB_TESTS

28
src/rpmostree-postprocess.c
View File

@ -1403,23 +1403,33 @@ read_xattrs_cb (OstreeRepo *repo,
GFileInfo *file_info, GFileInfo *file_info,
gpointer user_data) gpointer user_data)
{ {
GFile *rootpath = (GFile*)user_data; int rootfs_fd = GPOINTER_TO_INT (user_data);
/* Hardcoded at the moment, we're only taking file caps */ /* Hardcoded at the moment, we're only taking file caps */
static const char *accepted_xattrs[] = { "security.capability" }; static const char *accepted_xattrs[] = { "security.capability" };
guint i; guint i;
gs_unref_variant GVariant *existing_xattrs = NULL; gs_unref_variant GVariant *existing_xattrs = NULL;
gs_free_variant_iter GVariantIter *viter = NULL; gs_free_variant_iter GVariantIter *viter = NULL;
gs_unref_object GFile *path = NULL;
GError *local_error = NULL; GError *local_error = NULL;
GError **error = &local_error; GError **error = &local_error;
GVariant *key, *value; GVariant *key, *value;
GVariantBuilder builder; GVariantBuilder builder;
if (relpath[0] == '/')
relpath++;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ayay)")); g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ayay)"));
path = g_file_resolve_relative_path (rootpath, relpath[0] == '/' ? relpath+1 : relpath); if (!*relpath)
if (!gs_file_get_all_xattrs (path, &existing_xattrs, NULL, error)) {
goto out; if (!gs_fd_get_all_xattrs (rootfs_fd, &existing_xattrs, NULL, error))
goto out;
}
else
{
if (!gs_dfd_and_name_get_all_xattrs (rootfs_fd, relpath, &existing_xattrs,
NULL, error))
goto out;
}
viter = g_variant_iter_new (existing_xattrs); viter = g_variant_iter_new (existing_xattrs);
@ -1440,7 +1450,7 @@ read_xattrs_cb (OstreeRepo *repo,
g_variant_builder_clear (&builder); g_variant_builder_clear (&builder);
/* Unfortunately we have no way to throw from this callback */ /* Unfortunately we have no way to throw from this callback */
g_printerr ("Failed to read xattrs of '%s': %s\n", g_printerr ("Failed to read xattrs of '%s': %s\n",
gs_file_get_path_cached (path), local_error->message); relpath, local_error->message);
exit (1); exit (1);
} }
return g_variant_ref_sink (g_variant_builder_end (&builder)); return g_variant_ref_sink (g_variant_builder_end (&builder));
@ -1504,6 +1514,7 @@ rpmostree_commit (GFile *rootfs,
gs_free char *new_revision = NULL; gs_free char *new_revision = NULL;
gs_unref_object GFile *root_tree = NULL; gs_unref_object GFile *root_tree = NULL;
gs_unref_object OstreeSePolicy *sepolicy = NULL; gs_unref_object OstreeSePolicy *sepolicy = NULL;
_cleanup_close_ int rootfs_fd = -1;
/* hardcode targeted policy for now */ /* hardcode targeted policy for now */
if (enable_selinux) if (enable_selinux)
@ -1520,11 +1531,14 @@ rpmostree_commit (GFile *rootfs,
if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error)) if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
goto out; goto out;
if (!gs_file_open_dir_fd (rootfs, &rootfs_fd, cancellable, error))
goto out;
mtree = ostree_mutable_tree_new (); mtree = ostree_mutable_tree_new ();
commit_modifier = ostree_repo_commit_modifier_new (0, NULL, NULL, NULL); commit_modifier = ostree_repo_commit_modifier_new (0, NULL, NULL, NULL);
ostree_repo_commit_modifier_set_xattr_callback (commit_modifier, ostree_repo_commit_modifier_set_xattr_callback (commit_modifier,
read_xattrs_cb, NULL, read_xattrs_cb, NULL,
rootfs); GINT_TO_POINTER (rootfs_fd));
if (sepolicy) if (sepolicy)
{ {
const char *policy_name = ostree_sepolicy_get_name (sepolicy); const char *policy_name = ostree_sepolicy_get_name (sepolicy);