From 56f95cc5c1e208057d5ab4919e634dd1a4cd56ac Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 9 Feb 2021 16:32:20 -0500 Subject: [PATCH] extensions: Don't try to chown RPM packages We don't need it and it won't work in the unprivileged path where we're running this in a cosa supermin (of course, this is all a bit silly because we don't actually need privileges to begin with for this, but there's a lot of momentum in sticking with that workflow). Update submodule: libglnx --- libglnx | 2 +- src/app/rpmostree-compose-builtin-tree.cxx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libglnx b/libglnx index 900caea6..4c9055ac 160000 --- a/libglnx +++ b/libglnx @@ -1 +1 @@ -Subproject commit 900caea698690b18db4f2a9cd2c3abb4f84f10b5 +Subproject commit 4c9055ac08bb64dca146724f488cce4c1ce4c628 diff --git a/src/app/rpmostree-compose-builtin-tree.cxx b/src/app/rpmostree-compose-builtin-tree.cxx index 1f4e4384..051d9bcd 100644 --- a/src/app/rpmostree-compose-builtin-tree.cxx +++ b/src/app/rpmostree-compose-builtin-tree.cxx @@ -1617,8 +1617,9 @@ rpmostree_compose_builtin_extensions (int argc, DnfPackage *pkg = (DnfPackage*)extensions_pkgs->pdata[i]; const char *src = dnf_package_get_filename (pkg); const char *basename = glnx_basename (src); + GLnxFileCopyFlags flags = static_cast(GLNX_FILE_COPY_NOXATTRS | GLNX_FILE_COPY_NOCHOWN); if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd, - basename, GLNX_FILE_COPY_NOXATTRS, cancellable, error)) + basename, flags, cancellable, error)) return FALSE; } @@ -1654,8 +1655,9 @@ rpmostree_compose_builtin_extensions (int argc, DnfPackage *pkg = (DnfPackage*)devel_pkgs_to_download->pdata[i]; const char *src = dnf_package_get_filename (pkg); const char *basename = glnx_basename (src); + GLnxFileCopyFlags flags = static_cast(GLNX_FILE_COPY_NOXATTRS | GLNX_FILE_COPY_NOCHOWN); if (!glnx_file_copy_at (AT_FDCWD, dnf_package_get_filename (pkg), NULL, output_dfd, - basename, GLNX_FILE_COPY_NOXATTRS, cancellable, error)) + basename, flags, cancellable, error)) return FALSE; }