summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Chroot.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-18 14:14:21 -0400
committerJoey Hess2015-10-18 14:14:21 -0400
commit6c96481dd39d1e0fbcef8dd68300a66e13db9ed9 (patch)
tree81b8c2a296dcaaa0e2cd43ece365cbf39c957e1c /src/Propellor/Property/Chroot.hs
parentf6e352767eaf236acb929a9793dee28eb4897baa (diff)
parent2ad09b34ecec5a643a4a08c88a0a1cc7703094e3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Chroot.hs')
-rw-r--r--src/Propellor/Property/Chroot.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index ab914180..3a108540 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -7,7 +7,7 @@ module Propellor.Property.Chroot (
provisioned,
-- * Internal use
provisioned',
- propigateChrootInfo,
+ propagateChrootInfo,
propellChroot,
chain,
) where
@@ -61,7 +61,7 @@ debootstrapped system conf location = case system of
-- is first unmounted. Note that it does not ensure that any processes
-- that might be running inside the chroot are stopped.
provisioned :: Chroot -> RevertableProperty
-provisioned c = provisioned' (propigateChrootInfo c) c False
+provisioned c = provisioned' (propagateChrootInfo c) c False
provisioned' :: (Property HasInfo -> Property HasInfo) -> Chroot -> Bool -> RevertableProperty
provisioned' propigator c@(Chroot loc system builderconf _) systemdonly =
@@ -82,8 +82,8 @@ provisioned' propigator c@(Chroot loc system builderconf _) systemdonly =
teardown = toProp (revert built)
-propigateChrootInfo :: (IsProp (Property i)) => Chroot -> Property i -> Property HasInfo
-propigateChrootInfo c@(Chroot location _ _ _) p = propigateContainer location c p'
+propagateChrootInfo :: (IsProp (Property i)) => Chroot -> Property i -> Property HasInfo
+propagateChrootInfo c@(Chroot location _ _ _) p = propagateContainer location c p'
where
p' = infoProperty
(propertyDesc p)