summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-27 17:28:17 -0400
committerJoey Hess2016-03-27 17:28:17 -0400
commitf69e185f99394b658f14f9d62a8fb55f7d179d30 (patch)
tree6cc313df043941b87e7e4c75cdd7e873ac9f992f /src/Propellor/Property/Systemd.hs
parentbc87125af96fa0c19d69883a30f3bc7b240e2940 (diff)
ported
fixed up chroot to take Props
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index eaf7df8b..94215593 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -188,19 +188,18 @@ machined = withOS "machined installed" $ \w o ->
-- add a property such as `osDebian` to specify the operating system
-- to bootstrap.
--
--- > container "webserver" (Chroot.debootstrapped mempty)
+-- > container "webserver" $ \d -> Chroot.debootstrapped mempty d $ props
-- > & osDebian Unstable "amd64"
-- > & Apt.installedRunning "apache2"
-- > & ...
container :: MachineName -> (FilePath -> Chroot.Chroot) -> Container
container name mkchroot =
- let c = Container name chroot h
+ let c = Container name chroot (host name (containerProps chroot))
in setContainerProps c $ containerProps c
&^ resolvConfed
&^ linkJournal
where
chroot = mkchroot (containerDir name)
- h = Host name [] mempty
-- | Runs a container using systemd-nspawn.
--