summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 01:04:41 -0400
committerJoey Hess2014-11-18 01:04:41 -0400
commit8ea43c630215d545fca5d6aaf378ddc2853a2ebc (patch)
tree571f12c4d71c1558189dc172678c3c5407dc2287 /src/Propellor
parentdeb763d8e875bb5009c17e047da20ef90907f53a (diff)
avoid renaming --boot to --sync
That broke updating existing systems, since --boot is what makes the remote propellor update itself. The hostname is no longer needed by --boot for new propellor's, but is still passed for old ones. Note that there will be a double run of propellor when upgrading via --spin, because it now runs --boot followed by --spin on the remote host, and the old --boot also satisfied all properties.
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/CmdLine.hs6
-rw-r--r--src/Propellor/Types.hs2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 3a354098..4fd716ab 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -41,7 +41,7 @@ processCmdLine = go =<< getArgs
where
go ("--help":_) = usage
go ("--spin":h:[]) = return $ Spin h
- go ("--sync":[]) = return $ Sync
+ go ("--boot":h:[]) = return $ Boot h
go ("--add-key":k:[]) = return $ AddKey k
go ("--set":f:c:[]) = withprivfield f c Set
go ("--dump":f:c:[]) = withprivfield f c Dump
@@ -91,7 +91,7 @@ defaultMain hostlist = do
( onlyProcess $ withhost hn mainProperties
, go True (Spin hn)
)
- go False Sync = onlyProcess sync
+ go False (Boot _) = onlyProcess sync
withhost :: HostName -> (Host -> IO ()) -> IO ()
withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn)
@@ -223,7 +223,7 @@ spin hn hst = do
, "else " ++ intercalate " && "
[ "cd " ++ localdir
, "if ! test -x ./propellor; then make deps build; fi"
- , "./propellor --sync"
+ , "./propellor --boot " ++ hn
]
, "fi"
]
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index b3636eb4..cf16099a 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -144,6 +144,6 @@ data CmdLine
| AddKey String
| Continue CmdLine
| Chain HostName
- | Sync
+ | Boot HostName
| Docker HostName
deriving (Read, Show, Eq)