diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-18 18:07:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-18 18:11:04 -0400 |
| commit | e262a49a80ccc1f33fee62d1d3e1d54f22c7e6f2 (patch) | |
| tree | 8e1ed92dd2e2c3ca2c125b020348675d5e442a56 /src | |
| parent | d952c844072fd2c1a3a63dcecc7bfb305162d222 (diff) | |
enable terminal for --boot
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 9797d03e..d863ed35 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -196,12 +196,14 @@ getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref -- updated, it's run. spin :: HostName -> Host -> IO () spin hn hst = do - void $ gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"] + void $ actionMessage "git commit (signed)" $ + gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"] -- Push to central origin repo first, if possible. -- The remote propellor will pull from there, which avoids -- us needing to send stuff directly to the remote host. whenM hasOrigin $ - void $ boolSystem "git" [Param "push"] + void $ actionMessage "pushing to central git repository" $ + boolSystem "git" [Param "push"] cacheparams <- toCommand <$> sshCachingParams hn comm cacheparams =<< hostprivdata @@ -212,7 +214,7 @@ spin hn hst = do comm cacheparams privdata = withBothHandles createProcessSuccess - (proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) + (proc "ssh" $ cacheparams ++ ["-t", user, bootstrapcmd]) (comm' cacheparams privdata) comm' cacheparams privdata (toh, fromh) = loop where |