summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Chroot.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 22:37:25 -0400
committerJoey Hess2014-11-22 22:37:25 -0400
commit5fefb161c388f72fa598c238295ce1f051cc0029 (patch)
treededa74d1b11a02a2cc3c9a2390e51b6b9d3b0f43 /src/Propellor/Property/Chroot.hs
parentca09087caf5298b01f05bae4a4601fce47966c4f (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/Chroot.hs')
-rw-r--r--src/Propellor/Property/Chroot.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index f45e2fc1..3da8b0d6 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -11,6 +11,7 @@ module Propellor.Property.Chroot (
import Propellor
import Propellor.Types.Chroot
+import Propellor.Property.Chroot.Util
import qualified Propellor.Property.Debootstrap as Debootstrap
import qualified Propellor.Property.Systemd.Core as Systemd
import qualified Propellor.Shim as Shim
@@ -109,12 +110,14 @@ propellChroot c@(Chroot loc _ _ _) mkproc systemdonly = property (chrootDesc c "
chainprovision shim = do
parenthost <- asks hostName
cmd <- liftIO $ toChain parenthost c systemdonly
+ pe <- liftIO standardPathEnv
let p = mkproc
[ shim
, "--continue"
, show cmd
]
- liftIO $ withHandle StdoutHandle createProcessSuccess p
+ let p' = p { env = Just pe }
+ liftIO $ withHandle StdoutHandle createProcessSuccess p'
processChainOutput
toChain :: HostName -> Chroot -> Bool -> IO CmdLine