summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-07 15:07:03 -0400
committerJoey Hess2014-12-07 15:07:03 -0400
commitfaf4c21ca18bd551573eb56f4f86c16a23dd9806 (patch)
tree18ccf0ad32176c9cb606a8c13861131247683206 /src/Propellor/Property/Systemd.hs
parent322ae878bbaef94736fdc4cae60b6c3b8c17a54d (diff)
parent9ca332e48169ac19dad050a7f99e0db523d8d9c4 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index a2130a21..9cb532e0 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -151,9 +151,8 @@ nspawnService (Container name _ _) cfg = RevertableProperty setup teardown
<$> servicefilecontent
<*> catchDefaultIO "" (readFile servicefile)
- writeservicefile = property servicefile $ liftIO $ do
+ writeservicefile = property servicefile $ makeChange $
viaTmp writeFile servicefile =<< servicefilecontent
- return MadeChange
setupservicefile = check (not <$> goodservicefile) $
-- if it's running, it has the wrong configuration,