summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Schroot.hs
diff options
context:
space:
mode:
authorJoey Hess2018-05-03 12:25:48 -0400
committerJoey Hess2018-05-03 12:25:48 -0400
commit8f4a01225dbaf4d3f68ad0d94edab3f7650250ad (patch)
treef08f8e3e79e813ba132c7195a62868ba17e829a6 /src/Propellor/Property/Schroot.hs
parent543aa510790b7b91c0c7dfc13fe41d8c80bc1f77 (diff)
parent94653981cab8a9e0640a8ce3eee54a186479c1e5 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Schroot.hs')
-rw-r--r--src/Propellor/Property/Schroot.hs5
1 files 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 <https://wiki.debian.org/sbuild>.
-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"]