diff --git a/libglnx b/libglnx
index c231a3b8..381ca54e 160000
--- a/libglnx
+++ b/libglnx
@@ -1 +1 @@
-Subproject commit c231a3b845981d4b237e8f63ef3503e070009386
+Subproject commit 381ca54ee3a47de291d26a5db8772732fb4a9d59
diff --git a/src/libpriv/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c
index 558a3134..02a3c5b1 100644
--- a/src/libpriv/rpmostree-postprocess.c
+++ b/src/libpriv/rpmostree-postprocess.c
@@ -1143,7 +1143,8 @@ rpmostree_treefile_postprocessing (GFile         *yumroot,
       remove = json_object_get_array_member (treefile, "remove-from-packages");
       len = json_array_get_length (remove);
 
-      if (!rpmostree_get_pkglist_for_root (yumroot, &sack, &pkglist,
+      if (!rpmostree_get_pkglist_for_root (AT_FDCWD, gs_file_get_path_cached (yumroot),
+                                           &sack, &pkglist,
                                            cancellable, error))
         {
           g_prefix_error (error, "Reading package set: ");
diff --git a/src/libpriv/rpmostree-treepkgdiff.c b/src/libpriv/rpmostree-treepkgdiff.c
index ae9ccb44..0f7d7ba4 100644
--- a/src/libpriv/rpmostree-treepkgdiff.c
+++ b/src/libpriv/rpmostree-treepkgdiff.c
@@ -26,7 +26,8 @@
 #include "rpmostree-cleanup.h"
 
 gboolean
-rpmostree_get_pkglist_for_root (GFile            *root,
+rpmostree_get_pkglist_for_root (int               dfd,
+                                const char       *path,
                                 HySack           *out_sack,
                                 HyPackageList    *out_pkglist,
                                 GCancellable     *cancellable,
@@ -37,15 +38,16 @@ rpmostree_get_pkglist_for_root (GFile            *root,
   _cleanup_hysack_ HySack sack = NULL;
   _cleanup_hyquery_ HyQuery query = NULL;
   _cleanup_hypackagelist_ HyPackageList pkglist = NULL;
+  g_autofree char *fullpath = glnx_fdrel_abspath (dfd, path);
 
 #if BUILDOPT_HAWKEY_SACK_CREATE2
   sack = hy_sack_create (NULL, NULL,
-                         gs_file_get_path_cached (root),
+                         fullpath,
                          NULL,
                          HY_MAKE_CACHE_DIR);
 #else
   sack = hy_sack_create (NULL, NULL,
-                         gs_file_get_path_cached (root),
+                         fullpath,
                          HY_MAKE_CACHE_DIR);
 #endif
   if (sack == NULL)
@@ -73,8 +75,9 @@ rpmostree_get_pkglist_for_root (GFile            *root,
 }
 
 static gboolean
-print_rpmdb_diff (GFile          *oldroot,
-                  GFile          *newroot,
+print_rpmdb_diff (int             dfd,
+                  const char     *oldroot,
+                  const char     *newroot,
                   GCancellable   *cancellable,
                   GError        **error)
 {
@@ -87,11 +90,11 @@ print_rpmdb_diff (GFile          *oldroot,
   HyPackage pkg;
   gboolean printed_header = FALSE;
 
-  if (!rpmostree_get_pkglist_for_root (oldroot, &old_sack, &old_pkglist,
+  if (!rpmostree_get_pkglist_for_root (dfd, oldroot, &old_sack, &old_pkglist,
                                        cancellable, error))
     goto out;
 
-  if (!rpmostree_get_pkglist_for_root (newroot, &new_sack, &new_pkglist,
+  if (!rpmostree_get_pkglist_for_root (dfd, newroot, &new_sack, &new_pkglist,
                                        cancellable, error))
     goto out;
   
@@ -177,20 +180,23 @@ rpmostree_print_treepkg_diff (OstreeSysroot    *sysroot,
   OstreeDeployment *new_deployment;
   gs_unref_ptrarray GPtrArray *deployments = 
     ostree_sysroot_get_deployments (sysroot);
-  gs_unref_object GFile *booted_root = NULL;
-  gs_unref_object GFile *new_root = NULL;
+  int sysroot_dfd;
 
   booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
   
   g_assert (deployments->len > 1);
   new_deployment = deployments->pdata[0];
+
+  sysroot_dfd = ostree_sysroot_get_fd (sysroot);
   
   if (booted_deployment && new_deployment != booted_deployment)
     {
-      booted_root = ostree_sysroot_get_deployment_directory (sysroot, booted_deployment);
-      new_root = ostree_sysroot_get_deployment_directory (sysroot, new_deployment);
+      g_autofree char *booted_root =
+        ostree_sysroot_get_deployment_dirpath (sysroot, booted_deployment);
+      g_autofree char *new_root =
+        ostree_sysroot_get_deployment_dirpath (sysroot, new_deployment);
       
-      if (!print_rpmdb_diff (booted_root, new_root, cancellable, error))
+      if (!print_rpmdb_diff (sysroot_dfd, booted_root, new_root, cancellable, error))
         goto out;
     }
 
diff --git a/src/libpriv/rpmostree-treepkgdiff.h b/src/libpriv/rpmostree-treepkgdiff.h
index 43c89ea3..f4f0818b 100644
--- a/src/libpriv/rpmostree-treepkgdiff.h
+++ b/src/libpriv/rpmostree-treepkgdiff.h
@@ -24,7 +24,8 @@
 #include "rpmostree-cleanup.h"
 
 gboolean
-rpmostree_get_pkglist_for_root (GFile            *root,
+rpmostree_get_pkglist_for_root (int               dfd,
+                                const char       *path,
                                 HySack           *out_sack,
                                 HyPackageList    *out_pkglist,
                                 GCancellable     *cancellable,