summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2018-02-27 12:09:46 -0400
committerJoey Hess <joeyh@joeyh.name>2018-02-27 12:09:46 -0400
commit3919fa183bce29d4fbdbdcc4bd780e462dd6700f (patch)
tree1e549d69ec771d7f5505b94c93c5843bd44850fb /src/Propellor/Property/Systemd.hs
parent3e1d8b6b6cbbb4d9560fb0d2ea1aec22e5f19239 (diff)
parent094a6419f7e5ddb0566e10ef4122306187dc00d7 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 51d1313c..8fa236d2 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -205,8 +205,8 @@ machined = withOS "machined installed" $ \w o ->
case o of
-- Split into separate debian package since systemd 225.
(Just (System (Debian _ suite) _))
- | not (isStable suite) -> ensureProperty w $
- Apt.installed ["systemd-container"]
+ | not (isStable suite) || suite == (Stable "stretch") ->
+ ensureProperty w $ Apt.installed ["systemd-container"]
_ -> noChange
-- | Defines a container with a given machine name,