Commit 7b695a0d authored by Iustin Pop's avatar Iustin Pop
Browse files

htools: switch hscan to the generic binary


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 201b6c34
......@@ -98,7 +98,6 @@
/htools/.hpc
/htools/coverage
/htools/hscan
/htools/hspace
/htools/htools
/htools/test
......
......@@ -307,10 +307,9 @@ docrst = \
doc/walkthrough.rst
HS_PROGS = \
htools/hscan \
htools/hspace \
htools/htools
HS_BIN_ROLES = hbal
HS_BIN_ROLES = hbal hscan
HS_ALL_PROGS = $(HS_PROGS) htools/test
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
......@@ -344,6 +343,7 @@ HS_LIB_SRCS = \
htools/Ganeti/HTools/Utils.hs \
htools/Ganeti/HTools/Program/Hail.hs \
htools/Ganeti/HTools/Program/Hbal.hs \
htools/Ganeti/HTools/Program/Hscan.hs \
htools/Ganeti/Jobs.hs \
htools/Ganeti/Luxi.hs \
htools/Ganeti/OpCodes.hs
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
module Main (main) where
module Ganeti.HTools.Program.Hscan (main) where
import Control.Monad
import Data.Maybe (isJust, fromJust, fromMaybe)
......
......@@ -32,11 +32,13 @@ import System.IO
import Ganeti.HTools.Utils
import qualified Ganeti.HTools.Program.Hail as Hail
import qualified Ganeti.HTools.Program.Hbal as Hbal
import qualified Ganeti.HTools.Program.Hscan as Hscan
-- | Supported binaries.
personalities :: [(String, IO ())]
personalities = [ ("hail", Hail.main)
, ("hbal", Hbal.main)
, ("hscan", Hscan.main)
]
-- | Display usage and exit.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment