diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index b4fd265..0181d58 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -93,9 +93,8 @@ built' installprop target system@(System _ arch) config = , return FailedChange ) - teardownprop = property ("removed debootstrapped " ++ target) $ liftIO $ do - removetarget - return MadeChange + teardownprop = property ("removed debootstrapped " ++ target) $ + makeChange removetarget removetarget = do submnts <- filter (\p -> simplifyPath p /= simplifyPath target) diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index a2130a2..9cb532e 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,