From c4de19f19121ee44cd9ffb4a307f386ea2b13efc Mon Sep 17 00:00:00 2001 From: Marek 'marx' Grac Date: Fri, 25 Sep 2015 11:14:08 +0200 Subject: [PATCH 3/4] fence_scsi: Install fence_scsi_check_hardreboot and fence_scsi_check --- fence/agents/scsi/Makefile.am | 10 ++++++++-- fence/agents/scsi/fence_scsi.py | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fence/agents/scsi/Makefile.am b/fence/agents/scsi/Makefile.am index 5315215..ad65d1b 100644 --- a/fence/agents/scsi/Makefile.am +++ b/fence/agents/scsi/Makefile.am @@ -7,7 +7,7 @@ SRC = $(TARGET).py EXTRA_DIST = $(SRC) scsidatadir = $(CLUSTERDATA) -scsidata_SCRIPTS = fence_scsi_check.pl +scsidata_SCRIPTS = fence_scsi_check fence_scsi_check_hardreboot fence_scsi_check.pl sbin_SCRIPTS = $(TARGET) @@ -18,9 +18,15 @@ FENCE_TEST_ARGS = -k 1 fence_scsi_check.pl: $(TARGET) cp $^ $@ +fence_scsi_check: $(TARGET) + cp $^ $@ + +fence_scsi_check_hardreboot: $(TARGET) + cp $^ $@ + include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk include $(top_srcdir)/make/agentpycheck.mk clean-local: clean-man - rm -f $(TARGET) $(SYMTARGET) fence_scsi_check.pl + rm -f $(TARGET) $(SYMTARGET) $(scsidata_SCRIPTS) diff --git a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py index ff34721..c13d4ed 100644 --- a/fence/agents/scsi/fence_scsi.py +++ b/fence/agents/scsi/fence_scsi.py @@ -426,6 +426,8 @@ def main(): #fence_scsi_check if os.path.basename(sys.argv[0]) == "fence_scsi_check.pl": sys.exit(scsi_check()) + elif os.path.basename(sys.argv[0]) == "fence_scsi_check": + sys.exit(scsi_check()) elif os.path.basename(sys.argv[0]) == "fence_scsi_check_hardreboot": sys.exit(scsi_check(True)) -- 2.4.3