summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 16:58:03 -0400
committerJoey Hess2016-03-07 16:58:03 -0400
commita654b64ac5d466039494673c5e829c94a3902ce2 (patch)
treebfd8ba842190ee49efaee151ed20e21642048f85
parentac64b37ac76a145ff80eef1d8764f8ab3566395b (diff)
clean up
-rw-r--r--src/Propellor/Property/Systemd.hs16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 0ad2186e..2234ad5c 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -174,15 +174,13 @@ journaldConfigured option value =
-- | Ensures machined and machinectl are installed
machined :: Property NoInfo
-machined = go `describe` "machined installed"
- where
- go = withOS ("standard sources.list") $ \o ->
- case o of
- -- Split into separate debian package since systemd 225.
- (Just (System (Debian suite) _))
- | not (isStable suite) -> ensureProperty $
- Apt.installed ["systemd-container"]
- _ -> noChange
+machined = withOS "machined installed" $ \o ->
+ case o of
+ -- Split into separate debian package since systemd 225.
+ (Just (System (Debian suite) _))
+ | not (isStable suite) -> ensureProperty $
+ Apt.installed ["systemd-container"]
+ _ -> noChange
-- | Defines a container with a given machine name, and operating system,
-- and how to create its chroot if not already present.