From a6790167e9ee14d818a88e3f8164cfd7608ec2d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Oct 2015 13:06:38 -0400 Subject: propellor spin --- src/Propellor/Property/DiskImage.hs | 2 +- src/Propellor/Property/Rsync.hs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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. -- -- cgit v1.2.3