summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-23 15:14:00 -0400
committerJoey Hess2015-10-23 15:14:00 -0400
commite9fdfd5de1546f880d3bc8868a235a68f5f01e54 (patch)
treef46a402d83bc3d264ee50ddeb62391098b196f2c /src/Propellor/Property/OS.hs
parentc9e408af6ddb296d60c6eeb6cdb3210262dd7cde (diff)
allow specifying filesystem mount options
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