|
 |
3340af |
From ad16ebe302d8f7acee25afc767c03128a0daf98c Mon Sep 17 00:00:00 2001
|
|
|
3340af |
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
3340af |
Date: Fri, 12 Sep 2014 21:02:59 +0200
|
|
|
3340af |
Subject: [PATCH] fence_zvm: Fixes for better upstream inclusion
|
|
|
3340af |
|
|
|
3340af |
---
|
|
|
3340af |
fence/agents/zvm/Makefile.am | 7 +++++++
|
|
|
3340af |
fence/agents/zvm/fence_zvm.c | 1 +
|
|
|
3340af |
fence/agents/zvm/fence_zvmip.c | 1 +
|
|
|
3340af |
3 files changed, 9 insertions(+)
|
|
|
3340af |
|
|
|
3340af |
diff --git a/fence/agents/zvm/Makefile.am b/fence/agents/zvm/Makefile.am
|
|
|
3340af |
index 2439985..62eb862 100644
|
|
|
3340af |
--- a/fence/agents/zvm/Makefile.am
|
|
|
3340af |
+++ b/fence/agents/zvm/Makefile.am
|
|
|
3340af |
@@ -1,5 +1,7 @@
|
|
|
3340af |
MAINTAINERCLEANFILES = Makefile.in
|
|
|
3340af |
|
|
|
3340af |
+TARGET = fence_zvmip
|
|
|
3340af |
+
|
|
|
3340af |
sbin_PROGRAMS = fence_zvm fence_zvmip
|
|
|
3340af |
|
|
|
3340af |
noinst_HEADERS = fence_zvm.h
|
|
|
3340af |
@@ -12,6 +14,11 @@ fence_zvmip_CFLAGS = -D_GNU_SOURCE
|
|
|
3340af |
|
|
|
3340af |
dist_man_MANS = fence_zvm.8 fence_zvmip.8
|
|
|
3340af |
|
|
|
3340af |
+#include $(top_srcdir)/make/fencemanc.mk
|
|
|
3340af |
+
|
|
|
3340af |
+clean-local:
|
|
|
3340af |
+ rm -f $(sbin_PROGRAMS)
|
|
|
3340af |
+
|
|
|
3340af |
FENCE_TEST_ARGS = -n test -a test -p test -u test
|
|
|
3340af |
|
|
|
3340af |
include $(top_srcdir)/make/agentccheck.mk
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvm.c b/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
index 2ec4be9..e5a7c2b 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
@@ -599,6 +599,7 @@ zvm_metadata()
|
|
|
3340af |
fprintf (stdout, "<longdesc>");
|
|
|
3340af |
fprintf (stdout, "The fence_zvm agent is intended to be used with with z/VM SMAPI service.");
|
|
|
3340af |
fprintf (stdout, "</longdesc>\n");
|
|
|
3340af |
+ fprintf (stdout, "<vendor-url>http://www.ibm.com</vendor-url>\n");
|
|
|
3340af |
|
|
|
3340af |
fprintf (stdout, "<parameters>\n");
|
|
|
3340af |
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvmip.c b/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
index 94c9e2e..3342bc6 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
@@ -804,6 +804,7 @@ zvm_metadata()
|
|
|
3340af |
fprintf (stdout, "<longdesc>");
|
|
|
3340af |
fprintf (stdout, "The fence_zvm agent is intended to be used with with z/VM SMAPI service via TCP/IP");
|
|
|
3340af |
fprintf (stdout, "</longdesc>\n");
|
|
|
3340af |
+ fprintf (stdout, "<vendor-url>http://www.ibm.com</vendor-url>\n");
|
|
|
3340af |
|
|
|
3340af |
fprintf (stdout, "<parameters>\n");
|
|
|
3340af |
|
|
|
3340af |
--
|
|
|
3340af |
1.9.3
|
|
|
3340af |
|