On Fri, Jan 3, 2014 at 10:23 AM, Jose A. Lopes <[email protected]> wrote: > I'd forgotten to add the binary 'src/ganeti-kvmd' to '.gitignore'. > > diff --git a/.gitignore b/.gitignore > index e575749..ccde486 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -138,6 +138,7 @@ > /src/hs2py > /src/hs2py-constants > /src/ganeti-confd > +/src/ganeti-kvmd > /src/ganeti-luxid > /src/ganeti-mond > /src/rpc-test > > On Fri, Jan 03, 2014 at 09:42:07AM +0100, Jose A. Lopes wrote: >> Add KVM daemon entry point, command-line options, backgrounding, etc >> >> Signed-off-by: Jose A. Lopes <[email protected]> >> --- >> Makefile.am | 2 ++ >> src/ganeti-kvmd.hs | 46 ++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 48 insertions(+) >> create mode 100644 src/ganeti-kvmd.hs >> >> diff --git a/Makefile.am b/Makefile.am >> index eb23dfd..b4df41f 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -578,6 +578,7 @@ endif >> >> # Haskell programs to be compiled by "make really-all" >> HS_COMPILE_PROGS= \ >> + src/ganeti-kvmd \ >> src/ganeti-mond \ >> src/hconfd \ >> src/hluxid \ >> @@ -1049,6 +1050,7 @@ src/ganeti-luxid: src/hluxid >> >> nodist_sbin_SCRIPTS += src/ganeti-confd >> nodist_sbin_SCRIPTS += src/ganeti-luxid >> +nodist_sbin_SCRIPTS += src/ganeti-kvmd >> endif >> >> if ENABLE_MOND >> diff --git a/src/ganeti-kvmd.hs b/src/ganeti-kvmd.hs >> new file mode 100644 >> index 0000000..ea24a61 >> --- /dev/null >> +++ b/src/ganeti-kvmd.hs >> @@ -0,0 +1,46 @@ >> +{-| KVM daemon main >> + >> +-} >> + >> +{- >> + >> +Copyright (C) 2013 Google Inc. >> + >> +This program is free software; you can redistribute it and/or modify >> +it under the terms of the GNU General Public License as published by >> +the Free Software Foundation; either version 2 of the License, or >> +(at your option) any later version. >> + >> +This program is distributed in the hope that it will be useful, but >> +WITHOUT ANY WARRANTY; without even the implied warranty of >> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> +General Public License for more details. >> + >> +You should have received a copy of the GNU General Public License >> +along with this program; if not, write to the Free Software >> +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA >> +02110-1301, USA. >> + >> +-} >> + >> +import Ganeti.Daemon (OptType) >> +import qualified Ganeti.Daemon as Daemon >> +import qualified Ganeti.Kvmd as Kvmd (start) >> +import Ganeti.Runtime (GanetiDaemon(..)) >> + >> +-- | Options list and functions. >> +options :: [OptType] >> +options = >> + [ Daemon.oNoDaemonize >> + , Daemon.oNoUserChecks >> + , Daemon.oDebug >> + , Daemon.oSyslogUsage >> + ] >> + >> +-- | Main function. >> +main :: IO () >> +main = >> + Daemon.genericMain GanetiKvmd options >> + (\_ -> return . Right $ ()) >> + (\_ _ -> return ()) >> + (\_ _ _ -> Kvmd.start) >> -- >> 1.8.5.1 >> > > -- > Jose Antonio Lopes > Ganeti Engineering > Google Germany GmbH > Dienerstr. 12, 80331, München > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores > Steuernummer: 48/725/00206 > Umsatzsteueridentifikationsnummer: DE813741370
LGTM to the patch with the interdiff. Thanks, Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
