LGTM, thanks!
On Tue, Jun 03, 2014 at 10:02:14AM +0200, 'Klaus Aehlig' via ganeti-devel wrote: > ...before starting up. The reason is that this daemon assumes > authoritative knowledge of the configuration hence we need to > be absolutely sure that no second daemon is running on the wrong > node. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/WConfd/Server.hs | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/Ganeti/WConfd/Server.hs b/src/Ganeti/WConfd/Server.hs > index 836a891..a40a712 100644 > --- a/src/Ganeti/WConfd/Server.hs > +++ b/src/Ganeti/WConfd/Server.hs > @@ -39,6 +39,7 @@ import System.Directory (doesFileExist) > > import Ganeti.BasicTypes > import Ganeti.Daemon > +import Ganeti.Daemon.Utils (handleMasterVerificationOptions) > import Ganeti.Logging (logInfo, logDebug) > import Ganeti.Locking.Locks > import Ganeti.Locking.Waiting > @@ -62,7 +63,7 @@ type PrepResult = (Server, DaemonHandle) > > -- | Check function for luxid. > checkMain :: CheckFn () > -checkMain _ = return $ Right () > +checkMain = handleMasterVerificationOptions > > -- | Prepare function for luxid. > prepMain :: PrepFn () PrepResult > -- > 1.9.1.423.g4596e3a >
