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