cluster: RHEL510 - fencing: remove additional code

Marek GrĂ¡c marx at fedoraproject.org
Tue Jun 4 08:29:00 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=75f10d2cb456040124adf819adbe077d9954b320
Commit:        75f10d2cb456040124adf819adbe077d9954b320
Parent:        0c3782fd3fa61e9ceea938cc4f61e8572c6916c8
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Jun 3 16:22:26 2013 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Jun 3 16:22:26 2013 +0200

fencing: remove additional code

When resolving bug #904195 - additional code that removes fence_manual
and changes configure was added. This was not intended, so this patch
removes it.
---
 configure             |    8 ++++----
 fence/agents/Makefile |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 0bcbcc2..05fc58e 100755
--- a/configure
+++ b/configure
@@ -33,8 +33,8 @@ echo "configure gnbd"
 echo "configure rgmanager"
 (cd rgmanager; ./configure $@) 
 
-#echo "configure cmirror"
-#(cd cmirror; ./configure $@)
+echo "configure cmirror"
+(cd cmirror; ./configure $@)
 
-#echo "configure cmirror-kernel"
-#(cd cmirror-kernel; ./configure $@)
+echo "configure cmirror-kernel"
+(cd cmirror-kernel; ./configure $@)
diff --git a/fence/agents/Makefile b/fence/agents/Makefile
index e1d7eb4..669e291 100644
--- a/fence/agents/Makefile
+++ b/fence/agents/Makefile
@@ -33,7 +33,7 @@ all:
 	${MAKE} -C ipdu all
 	${MAKE} -C ipmilan all
 	${MAKE} -C lpar all
-#	${MAKE} -C manual all
+	${MAKE} -C manual all
 	${MAKE} -C mcdata all
 	# ${MAKE} -C rackswitch all
 	${MAKE} -C rhevm all
@@ -69,7 +69,7 @@ install: all
 	${MAKE} -C ipdu install
 	${MAKE} -C ipmilan install
 	${MAKE} -C lpar install
-#	${MAKE} -C manual install
+	${MAKE} -C manual install
 	${MAKE} -C mcdata install
 	# ${MAKE} -C rackswitch install
 	${MAKE} -C rhevm install
@@ -105,7 +105,7 @@ clean:
 	${MAKE} -C ipdu clean
 	${MAKE} -C ipmilan clean
 	${MAKE} -C lpar clean
-#	${MAKE} -C manual clean
+	${MAKE} -C manual clean
 	${MAKE} -C mcdata clean
 	# ${MAKE} -C rackswitch clean
 	${MAKE} -C rhevm clean


More information about the cluster-commits mailing list