From 72ed67a3c283c9968de184219c771c885afadd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 4 Sep 2016 17:56:00 +0200
Subject: [PATCH] setuid-wrappers: correctly umount the tmpfs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 393e646e4fab06b58542ace3ca2a90eab22c809d)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/modules/security/setuid-wrappers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index dcccd834286..fe220c94313 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -132,7 +132,7 @@ in
             # Compatibility with old state, just remove the folder and symlink
             rm -f ${wrapperDir}/*
             # if it happens to be a tmpfs
-            umount ${wrapperDir} || true
+            ${pkgs.utillinux}/bin/umount ${wrapperDir} || true
             rm -d ${wrapperDir}
             ln -d --symbolic $wrapperDir ${wrapperDir}
           else