cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

need to chain, not spin

This commit is contained in:
Joey Hess 2014-11-18 01:10:53 -04:00
parent e9ac2643f4
commit 8d995b1574
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Propellor/CmdLine.hs
View File

@ -91,7 +91,7 @@ defaultMain hostlist = do
( onlyProcess $ withhost hn mainProperties ( onlyProcess $ withhost hn mainProperties
, go True (Spin hn) , go True (Spin hn)
) )
go False (Boot _) = onlyProcess sync go False (Boot _) = onlyProcess boot
withhost :: HostName -> (Host -> IO ()) -> IO () withhost :: HostName -> (Host -> IO ()) -> IO ()
withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn) withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn)
@ -229,7 +229,7 @@ spin hn hst = do
] ]
spincmd = mkcmd spincmd = mkcmd
[ "cd " ++ localdir ++ " && ./propellor --spin " ++ hn ] [ "cd " ++ localdir ++ " && ./propellor --continue " ++ show (Chain hn) ]
getstatus :: Handle -> IO BootStrapStatus getstatus :: Handle -> IO BootStrapStatus
getstatus h = do getstatus h = do
@ -302,8 +302,8 @@ fromMarked marker s
len = length marker len = length marker
matches = filter (marker `isPrefixOf`) $ lines s matches = filter (marker `isPrefixOf`) $ lines s
sync :: IO () boot :: IO ()
sync = do boot = do
sendMarked stdout statusMarker $ show Ready sendMarked stdout statusMarker $ show Ready
reply <- hGetContentsStrict stdin reply <- hGetContentsStrict stdin