summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-24 13:57:47 -0400
committerJoey Hess2017-03-24 13:58:13 -0400
commit25114d92a53f519aaf874dc0df9bfdd9f8dd9964 (patch)
tree244a674c4b164362f053d173d490b67870f04b01 /src/Propellor/Property/Systemd.hs
parentb738aa54eed266d72669bcdafdbba7df6bc795fa (diff)
fix diskimage finalization bug
* Fix bug when using setContainerProps with a chroot that prevented properties added to a chroot that way from being seen when propellor was running inside the chroot. This affected disk image creation, and possibly other things that use chroots. The problem was, propagateChrootInfo was being passed the initial version of the Chroot, but then the Chroot got more properties added, and so those were not recorded in the _chroot info. Fix was simply to make InfoPropagator be passed the Chroot as an additional parameter, so Chroot.provisioned' can pass in the final Chroot to it.
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 8f9c3beb..7c40bd16 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -281,7 +281,7 @@ nspawned c@(Container name (Chroot.Chroot loc builder _ _) h) =
<!>
doNothing
- chroot = Chroot.Chroot loc builder (Chroot.propagateChrootInfo chroot) h
+ chroot = Chroot.Chroot loc builder Chroot.propagateChrootInfo h
-- | Sets up the service file for the container, and then starts
-- it running.