Update intermediary propellor in --spin --via

This commit is contained in:
Joey Hess 2015-01-01 17:09:21 -04:00
parent 138629941d
commit 7cbd367e1c
4 changed files with 5 additions and 3 deletions

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ propellor (1.2.3) UNRELEASED; urgency=medium
of the host, and if not, sshes to the host by IP address.
* Detect #774376 and refuse to use docker if the system is so broken
that docker exec doesn't enter a chroot.
* Update intermediary propellor in --spin --via
-- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400

View File

@ -54,7 +54,6 @@ processCmdLine = go =<< getArgs
go ("--help":_) = do
usage stdout
exitFailure
go ("--update":_:[]) = return $ Update Nothing
go ("--boot":_:[]) = return $ Update Nothing -- for back-compat
go ("--serialized":s:[]) = serialized Serialized s
go ("--continue":s:[]) = serialized Continue s
@ -98,8 +97,9 @@ defaultMain hostlist = do
go _ (DockerChain hn cid) = Docker.chain hostlist hn cid
go _ (DockerInit hn) = Docker.init hn
go _ (GitPush fin fout) = gitPushHelper fin fout
go _ (Relay h) = forceConsole >> updateFirst (Update (Just h)) (update (Just h))
go _ (Update Nothing) = forceConsole >> fetchFirst (onlyprocess (update Nothing))
go _ (Update (Just h)) = forceConsole >> fetchFirst (update (Just h))
go _ (Update (Just h)) = update (Just h)
go _ Merge = mergeSpin
go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline
go True cmdline = updateFirst cmdline $ go False cmdline

View File

@ -80,7 +80,7 @@ spin target relay hst = do
, "if ! test -x ./propellor; then make deps build; fi"
, if viarelay
then "./propellor --continue " ++
shellEscape (show (Update (Just target)))
shellEscape (show (Relay target))
-- Still using --boot for back-compat...
else "./propellor --boot " ++ target
]

View File

@ -165,6 +165,7 @@ data CmdLine
| Serialized CmdLine
| Continue CmdLine
| Update (Maybe HostName)
| Relay HostName
| DockerInit HostName
| DockerChain HostName String
| ChrootChain HostName FilePath Bool Bool