summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-21 14:11:02 -0400
committerJoey Hess2014-11-21 14:11:02 -0400
commit7d4d3e44518aef38e7c036e76dfaf8e6f1c21bdb (patch)
tree99d3c85472f270d406b32e749558a7a77bd62862 /src/Propellor/Property/Systemd.hs
parent5e1a47552a07b596b0b264ca752025335b29e45b (diff)
fix info propigation
Need to propigate the full container info, not the subset used in chroot deployment.
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 862b674b..9b0a445d 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -88,9 +88,9 @@ container name system ps = Container name system ps (Host name [] mempty)
nspawned :: Container -> RevertableProperty
nspawned c@(Container name system _ h) = RevertableProperty setup teardown
where
- setup = propertyList ("nspawned " ++ name) $
+ setup = combineProperties ("nspawned " ++ name) $
map toProp steps ++ [containerprovisioned]
- teardown = propertyList ("not nspawned " ++ name) $
+ teardown = combineProperties ("not nspawned " ++ name) $
map (toProp . revert) (reverse steps)
steps =
[ enterScript c
@@ -102,16 +102,16 @@ nspawned c@(Container name system _ h) = RevertableProperty setup teardown
-- that only has the Property of systemd being installed.
-- This is to avoid starting any daemons in the chroot,
-- which would not run in the container's namespace.
- chrootprovisioned = Chroot.provisioned $
+ chrootprovisioned = Chroot.provisioned' (Chroot.propigateChrootInfo chroot) $
mkChroot $ h { hostProperties = [installed] }
-- Use nsenter to enter container and and run propellor to
-- finish provisioning.
- containerprovisioned = Chroot.propellChroot
- (mkChroot h)
+ containerprovisioned = Chroot.propellChroot chroot
(enterContainerProcess c)
mkChroot = Chroot.Chroot (containerDir name) system
+ chroot = mkChroot h
nspawnService :: Container -> RevertableProperty
nspawnService (Container name _ ps _) = RevertableProperty setup teardown