summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2015-10-23 13:06:38 -0400
committerJoey Hess2015-10-23 13:06:38 -0400
commita6790167e9ee14d818a88e3f8164cfd7608ec2d5 (patch)
treecbba21555b4c6c587010276038dbc1a1e26b11ad /src/Propellor
parent65612072748cef8c2deddc17aa3d49a9b5ceabf2 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/DiskImage.hs2
-rw-r--r--src/Propellor/Property/Rsync.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 97880cf4..c8b9ffa1 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -160,7 +160,7 @@ partitionsPopulated chrootdir mnts devs = property desc $ mconcat $ zipWith go m
[ Include (Pattern m)
, Exclude (filesUnder m)
-- Preserve any lost+found directory that mkfs made
- , Exclude (Pattern "lost+found")
+ , Protect (Pattern "lost+found")
]) childmnts
-- | Ensures that a disk image file of the specified size exists.
diff --git a/src/Propellor/Property/Rsync.hs b/src/Propellor/Property/Rsync.hs
index 894b8cc7..cae3c877 100644
--- a/src/Propellor/Property/Rsync.hs
+++ b/src/Propellor/Property/Rsync.hs
@@ -22,10 +22,12 @@ syncDir = syncDirFiltered []
data Filter
= Include Pattern
| Exclude Pattern
+ | Protect Pattern
instance RsyncParam Filter where
toRsync (Include (Pattern p)) = "--include=" ++ p
toRsync (Exclude (Pattern p)) = "--exclude=" ++ p
+ toRsync (Protect (Pattern p)) = "--filter=P " ++ p
-- | A pattern to match against files that rsync is going to transfer.
--