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