summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 01:10:53 -0400
committerJoey Hess2014-11-18 01:11:32 -0400
commit8d995b1574e25ec06a49b74a394dd41a2618e33f (patch)
treeb02fefee3c2bd9bae0b99969bf5a6fb10c28bd90 /src/Propellor
parente9ac2643f4da4f5af5c6b355171d5113890d3c51 (diff)
need to chain, not spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/CmdLine.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 4fd716ab..c31a5cbb 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -91,7 +91,7 @@ defaultMain hostlist = do
( onlyProcess $ withhost hn mainProperties
, go True (Spin hn)
)
- go False (Boot _) = onlyProcess sync
+ go False (Boot _) = onlyProcess boot
withhost :: HostName -> (Host -> IO ()) -> IO ()
withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn)
@@ -229,7 +229,7 @@ spin hn hst = do
]
spincmd = mkcmd
- [ "cd " ++ localdir ++ " && ./propellor --spin " ++ hn ]
+ [ "cd " ++ localdir ++ " && ./propellor --continue " ++ show (Chain hn) ]
getstatus :: Handle -> IO BootStrapStatus
getstatus h = do
@@ -302,8 +302,8 @@ fromMarked marker s
len = length marker
matches = filter (marker `isPrefixOf`) $ lines s
-sync :: IO ()
-sync = do
+boot :: IO ()
+boot = do
sendMarked stdout statusMarker $ show Ready
reply <- hGetContentsStrict stdin