lib/sysroot: Use direct g_mkdtemp() for overlay tmpdir
authorColin Walters <walters@verbum.org>
Tue, 12 Sep 2017 14:21:17 +0000 (10:21 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 12 Sep 2017 20:09:12 +0000 (20:09 +0000)
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

src/libostree/ostree-sysroot.c

index b8c4b4c5765248fee16c6b1d8b51d83a6de17f80..18475d35d8b4b4af68502237b7d2ece502e20db2 100644 (file)
@@ -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");