summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-23 15:43:06 -0400
committerJoey Hess2015-10-23 15:43:06 -0400
commit42ed4b5e68ec84106850c07904ee6124a7805742 (patch)
tree9e49ef3e9a8d02d1951e07d1c31119e5eb7d5844 /src/Propellor/Property/OS.hs
parent3f17dd7cbef4ec6bbccc368e07be964dc7f9570b (diff)
parent3aee86abac10f1ad9d4b51c024f5f3c02cdbfc68 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index e176e33d..1f22888c 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -123,16 +123,16 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
-- Remount /dev, so that block devices etc are
-- available for other properties to use.
- unlessM (mount devfstype devfstype "/dev") $ do
+ unlessM (mount devfstype devfstype "/dev" mempty) $ do
warningMessage $ "failed mounting /dev using " ++ devfstype ++ "; falling back to MAKEDEV generic"
void $ boolSystem "sh" [Param "-c", Param "cd /dev && /sbin/MAKEDEV generic"]
-- Mount /sys too, needed by eg, grub-mkconfig.
- unlessM (mount "sysfs" "sysfs" "/sys") $
+ unlessM (mount "sysfs" "sysfs" "/sys" mempty) $
warningMessage "failed mounting /sys"
-- And /dev/pts, used by apt.
- unlessM (mount "devpts" "devpts" "/dev/pts") $
+ unlessM (mount "devpts" "devpts" "/dev/pts" mempty) $
warningMessage "failed mounting /dev/pts"
return MadeChange