From 8d995b1574e25ec06a49b74a394dd41a2618e33f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 01:10:53 -0400 Subject: need to chain, not spin --- src/Propellor/CmdLine.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 -- cgit v1.2.3