summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-11-20 16:04:48 -0400
committerJoey Hess2014-11-20 16:04:48 -0400
commit2293b46bf714ca5675515496c041952310b7bae2 (patch)
treeb710fd312bdbd960daa68f4f81c45c8983014e97 /src/Propellor/Property
parenta4f04fcb02d76d9903c5bbc65827565bad6c2d8c (diff)
fix chroot info propigation
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Chroot.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 38e09b52..9ce9ddaf 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -53,9 +53,11 @@ provisioned c@(Chroot loc system _) = RevertableProperty
teardown = undefined
propigateChrootInfo :: Chroot -> Property -> Property
-propigateChrootInfo c@(Chroot loc _ h) p = propigateInfo c p (<> chrootinfo)
- where
- chrootinfo = mempty $ mempty { _chroots = M.singleton loc h }
+propigateChrootInfo c p = propigateInfo c p (<> chrootInfo c)
+
+chrootInfo :: Chroot -> Info
+chrootInfo (Chroot loc _ h) =
+ mempty { _chrootinfo = mempty { _chroots = M.singleton loc h } }
-- | Propellor is run inside the chroot to provision it.
--