From 09191ed1fde898d69bf7f3862bd8400db84eff66 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 2 May 2018 10:35:48 -0700 Subject: make Schroot.overlaysInTmpfs revertable Useful when a build fails on a tmpfs (usually a package's test suite). Signed-off-by: Sean Whitton --- src/Propellor/Property/Schroot.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/Schroot.hs b/src/Propellor/Property/Schroot.hs index bb20f6e6..2f399b7c 100644 --- a/src/Propellor/Property/Schroot.hs +++ b/src/Propellor/Property/Schroot.hs @@ -32,8 +32,8 @@ usesOverlays = isJust . fromInfoVal -- Implicitly sets 'useOverlays' info property. -- -- Shell script from . -overlaysInTmpfs :: Property (HasInfo + DebianLike) -overlaysInTmpfs = go `requires` installed +overlaysInTmpfs :: RevertableProperty (HasInfo + DebianLike) UnixLike +overlaysInTmpfs = (go `requires` installed) undo where f = "/etc/schroot/setup.d/04tmpfs" go :: Property (HasInfo + UnixLike) @@ -58,6 +58,7 @@ overlaysInTmpfs = go `requires` installed , "fi" ] `onChange` (f `File.mode` combineModes (readModes ++ executeModes)) + undo = File.notPresent f installed :: Property DebianLike installed = Apt.installed ["schroot"] -- cgit v1.2.3