From: Colin Walters <walters@verbum.org>
Date: Tue, 12 Sep 2017 14:21:17 +0000 (-0400)
Subject: lib/sysroot: Use direct g_mkdtemp() for overlay tmpdir
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~32^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=662ad5b1719de2337561cbec5ad9bfeed2211513;p=ostree.git

lib/sysroot: Use direct g_mkdtemp() for overlay tmpdir

The new libglnx `glnx_mkdtempat()` uses autocleanups, which
is inconvenient for this use case where we *don't* want autocleanups.
Since we don't need it to be fd-relative, just directly invoke
`g_mkdtemp_full()` which is fine for this use case.

Prep for updating libglnx.

Closes: #1161
Approved by: jlebon
---

diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index b8c4b4c5..18475d35 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -1738,8 +1738,8 @@ ostree_sysroot_deployment_unlock (OstreeSysroot     *self,
                                                     "/usr", 0755, error))
             return FALSE;
 
-          if (!glnx_mkdtempat (AT_FDCWD, development_ovldir, 0755, error))
-            return FALSE;
+          if (g_mkdtemp_full (development_ovldir, 0755) == NULL)
+            return glnx_throw_errno_prefix (error, "mkdtemp");
         }
 
         development_ovl_upper = glnx_strjoina (development_ovldir, "/upper");