summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-10-15 13:01:32 -0400
committerJoey Hess2017-10-15 13:01:32 -0400
commit6c2c73f627d671f966fe709da7ce95bbd10c73a8 (patch)
tree15dd380fb370d8a3f09d5e3f77702bc3369fa0c0
parent96415fe18ede53fafb9054992beb0b703a4f0e9c (diff)
parentf2e902313ae02804df55c3e9584ddf88c4f889f1 (diff)
Merge remote-tracking branch 'nicolas/fstab-mounted'
-rw-r--r--src/Propellor/Property/Fstab.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/Fstab.hs b/src/Propellor/Property/Fstab.hs
index 29b85426..53ed4fba 100644
--- a/src/Propellor/Property/Fstab.hs
+++ b/src/Propellor/Property/Fstab.hs
@@ -26,7 +26,8 @@ import Utility.Table
mounted :: FsType -> Source -> MountPoint -> MountOpts -> Property Linux
mounted fs src mnt opts = tightenTargets $
listed fs src mnt opts
- `onChange` mountnow
+ `before` mountnow
+ `requires` File.dirExists mnt
where
-- This use of mountPoints, which is linux-only, is why this
-- property currently only supports linux.