summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Schroot.hs5
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
3 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9308a7bb..4d077d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ propellor (5.3.6) UNRELEASED; urgency=medium
oldstable), to avoid needing to depend on the semigroups transitional
package, but also because it's just too old to be worth supporting.
* stack.yaml: Updated to lts-9.21.
+ * Make Schroot.overlaysInTmpfs revertable
+ Thanks, Sean Whitton
-- Joey Hess <id@joeyh.name> Mon, 23 Apr 2018 13:12:25 -0400
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"]
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index d7f6196b..4d8ee240 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1074,7 +1074,7 @@ laptopSoftware = Apt.installed
, "bsdgames", "nethack-console"
, "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev"
, "ttf-bitstream-vera"
- , "mairix", "offlineimap", "mutt"
+ , "mairix", "offlineimap", "mutt", "slrn"
, "mtr", "nmap", "whois", "wireshark", "tcpdump", "iftop"
, "pmount", "tree", "pv"
, "arbtt", "hledger", "bc"