Merge branch 'devel-2.6' into master

[ganeti-local] / htools / Ganeti / HTools / Program.hs

diff --git a/htools/Ganeti/HTools/Program.hs b/htools/Ganeti/HTools/Program.hs
index 2817e83..fff678c 100644 (file)
--- a/htools/Ganeti/HTools/Program.hs
+++ b/htools/Ganeti/HTools/Program.hs
@@ -27,19 +27,23 @@ module Ganeti.HTools.Program
   ( personalities
   ) where
 
   ( personalities
   ) where
 

+import Ganeti.Common (ArgCompletion)

 import Ganeti.HTools.CLI (OptType, Options)
 
 import qualified Ganeti.HTools.Program.Hail as Hail
 import qualified Ganeti.HTools.Program.Hbal as Hbal
 import Ganeti.HTools.CLI (OptType, Options)
 
 import qualified Ganeti.HTools.Program.Hail as Hail
 import qualified Ganeti.HTools.Program.Hbal as Hbal

+import qualified Ganeti.HTools.Program.Hcheck as Hcheck

 import qualified Ganeti.HTools.Program.Hscan as Hscan
 import qualified Ganeti.HTools.Program.Hspace as Hspace
 import qualified Ganeti.HTools.Program.Hinfo as Hinfo
 
 -- | Supported binaries.
 import qualified Ganeti.HTools.Program.Hscan as Hscan
 import qualified Ganeti.HTools.Program.Hspace as Hspace
 import qualified Ganeti.HTools.Program.Hinfo as Hinfo
 
 -- | Supported binaries.

-personalities :: [(String, (Options -> [String] -> IO (), [OptType]))]
-personalities = [ ("hail",   (Hail.main,   Hail.options))
-                , ("hbal",   (Hbal.main,   Hbal.options))
-                , ("hscan",  (Hscan.main,  Hscan.options))
-                , ("hspace", (Hspace.main, Hspace.options))
-                , ("hinfo",  (Hinfo.main,  Hinfo.options))
+personalities :: [(String,
+                   (Options -> [String] -> IO (), [OptType], [ArgCompletion]))]
+personalities = [ ("hail",   (Hail.main,   Hail.options,   Hail.arguments))
+                , ("hbal",   (Hbal.main,   Hbal.options,   Hbal.arguments))
+                , ("hcheck", (Hcheck.main, Hcheck.options, Hcheck.arguments))
+                , ("hscan",  (Hscan.main,  Hscan.options,  Hscan.arguments ))
+                , ("hspace", (Hspace.main, Hspace.options, Hspace.arguments))
+                , ("hinfo",  (Hinfo.main,  Hinfo.options,  Hinfo.arguments))

                 ]
                 ]