summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2015-06-01 16:22:15 -0400
committerJoey Hess2015-06-01 16:22:15 -0400
commitc0b9c708c93b104dfca1bff80e082e2d2b0ad0a6 (patch)
tree441eb2e19886e871c3d5162ebca9ac393e4acd80 /src/Propellor/Property/Systemd.hs
parent85c3d110882f0f9d70316235221ba8b20754661f (diff)
don't mount /proc when provisioning systemd-nspawn container
While needed for chroot provisioning, it confuses system when systemd-nspawn runs it inside the container.
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 9e5ca432..c2446b2e 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -250,8 +250,8 @@ enterScript c@(Container name _ _) = setup <!> teardown
enterScriptFile :: Container -> FilePath
enterScriptFile (Container name _ _ ) = "/usr/local/bin/enter-" ++ mungename name
-enterContainerProcess :: Container -> [String] -> CreateProcess
-enterContainerProcess = proc . enterScriptFile
+enterContainerProcess :: Container -> [String] -> IO CreateProcess
+enterContainerProcess c ps = pure $ proc (enterScriptFile c) ps
nspawnServiceName :: MachineName -> ServiceName
nspawnServiceName name = "systemd-nspawn@" ++ name ++ ".service"