compose: fix bad umount

Closes: coreos#602 Closes: coreos#620 Approved by: cgwalters
cgwalters · Feb 10, 2017 · 3c77b6e · 3c77b6e
1 parent dd4b553
commit 3c77b6e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c
@@ -984,11 +984,13 @@ rpmostree_compose_builtin_tree (int             argc,
 
   g_free (self->ref);
 
-  /* Move back out of the workding directory to ensure unmount works */
+  /* Move back out of the workding directory and close all fds pointing
+   * to it ensure unmount works */
   (void )chdir ("/");
-
   if (self->workdir_dfd != -1)
     (void) close (self->workdir_dfd);
+  if (rootfs_fd != -1)
+    (void) close (rootfs_fd);
 
   if (workdir_is_tmp)
     {