summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-01 13:09:10 -0400
committerJoey Hess2014-04-01 13:09:10 -0400
commit2c328ad142421302b41bc961aa175f60e27f0ab3 (patch)
treef5caa1b63844baecc6681846487490b8f1b41c7f /Propellor/Property
parent9df409d2fb8aeb63d40255737420698df3c21f08 (diff)
shell syntax fix
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index c6a2bc7f..56ec0bde 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -121,7 +121,7 @@ ensureContainer cid@(ContainerId hn cn) image containerprops = do
-- Start the simplesh server that will be used by propellor
-- to run commands in the container. An interactive shell
-- is also started, so the user can attach and use it if desired.
- startsimplesh = ["sh", "-c", "./propellor --simplesh " ++ namedPipe cid ++ " & ; bash -l"]
+ startsimplesh = ["sh", "-c", "./propellor --simplesh " ++ namedPipe cid ++ " & bash -l"]
getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $
pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout