diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-08 22:37:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-08 22:37:11 -0400 |
| commit | 386281202d5cb526d1b35022b3709b1f1064f68e (patch) | |
| tree | 7dcea4e59765d4e1bb76ca23b864befc4546068a /src/Propellor/Property/Systemd.hs | |
| parent | b38cedc0a81085dd5e4267866d1f460054d9c50d (diff) | |
| parent | d7a9157e7e1e8f447864d9d0cdd20ed1839fc23c (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
| -rw-r--r-- | src/Propellor/Property/Systemd.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index 4da5b3f2..e44ef717 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -43,6 +43,7 @@ module Propellor.Property.Systemd ( import Propellor import Propellor.Types.Chroot import Propellor.Types.Container +import Propellor.Types.Info import qualified Propellor.Property.Chroot as Chroot import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.File as File @@ -209,7 +210,7 @@ nspawned c@(Container name (Chroot.Chroot loc system builderconf _) h) = where p = enterScript c `before` chrootprovisioned - `before` nspawnService c (_chrootCfg $ _chrootinfo $ hostInfo h) + `before` nspawnService c (_chrootCfg $ getInfo $ hostInfo h) `before` containerprovisioned -- Chroot provisioning is run in systemd-only mode, @@ -328,7 +329,7 @@ containerCfg :: String -> RevertableProperty containerCfg p = RevertableProperty (mk True) (mk False) where mk b = pureInfoProperty ("container configuration " ++ (if b then "" else "without ") ++ p') $ - mempty { _chrootinfo = mempty { _chrootCfg = SystemdNspawnCfg [(p', b)] } } + mempty { _chrootCfg = SystemdNspawnCfg [(p', b)] } p' = case p of ('-':_) -> p _ -> "--" ++ p |