From 7d4d3e44518aef38e7c036e76dfaf8e6f1c21bdb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Nov 2014 14:11:02 -0400 Subject: fix info propigation Need to propigate the full container info, not the subset used in chroot deployment. --- src/Propellor/Property/Chroot.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Chroot.hs') diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index e7bac84a..7fee3a59 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -3,6 +3,8 @@ module Propellor.Property.Chroot ( chroot, provisioned, -- * Internal use + provisioned', + propigateChrootInfo, propellChroot, chain, ) where @@ -38,8 +40,11 @@ chroot location system = Chroot location system (Host location [] mempty) -- Reverting this property removes the chroot. Note that it does not ensure -- that any processes that might be running inside the chroot are stopped. provisioned :: Chroot -> RevertableProperty -provisioned c@(Chroot loc system _) = RevertableProperty - (propigateChrootInfo c (go "exists" setup)) +provisioned c = provisioned' (propigateChrootInfo c) c + +provisioned' :: (Property -> Property) -> Chroot -> RevertableProperty +provisioned' propigator c@(Chroot loc system _) = RevertableProperty + (propigator $ go "exists" setup) (go "removed" teardown) where go desc a = property (chrootDesc c desc) $ ensureProperties [a] -- cgit v1.3-2-g0d8e