summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Debootstrap.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-30 10:26:43 -0400
committerJoey Hess2015-05-30 10:26:43 -0400
commit95b6d711e7da7f13d064086b30727e00ad72ecf5 (patch)
treef5a898e748a13bc143713f6c1bf4cb22f942bb42 /src/Propellor/Property/Debootstrap.hs
parentc67691f1aa202ae737264c68fe6f762dfe1b0481 (diff)
Mount /proc inside a chroot before provisioning it, to work around #787227
Diffstat (limited to 'src/Propellor/Property/Debootstrap.hs')
-rw-r--r--src/Propellor/Property/Debootstrap.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs
index f29ae56b..8d974eba 100644
--- a/src/Propellor/Property/Debootstrap.hs
+++ b/src/Propellor/Property/Debootstrap.hs
@@ -106,9 +106,7 @@ unpopulated d = null <$> catchDefaultIO [] (dirContents d)
removetarget :: FilePath -> IO ()
removetarget target = do
- submnts <- filter (\p -> simplifyPath p /= simplifyPath target)
- . filter (dirContains target)
- <$> mountPoints
+ submnts <- mountPointsBelow target
forM_ submnts umountLazy
removeDirectoryRecursive target