Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=3945eaad8... Commit: 3945eaad8141a333c88e956a2a5e8edc1b396221 Parent: a99d3b565e0c72d0ac8ae2b0f5cf6569a47cd0ae Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Jan 6 17:02:38 2014 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon Jan 6 17:02:38 2014 +0100
fencing: Fix replacement of path to ipmitool/amttool
--- fence/agents/ipmilan/fence_ipmilan.py | 2 +- make/fencebuild.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fence/agents/ipmilan/fence_ipmilan.py b/fence/agents/ipmilan/fence_ipmilan.py index b4e29fc..ece5d97 100644 --- a/fence/agents/ipmilan/fence_ipmilan.py +++ b/fence/agents/ipmilan/fence_ipmilan.py @@ -156,7 +156,7 @@ def define_new_opts(): "help" : "--ipmitool-path=[path] Path to ipmitool binary", "required" : "0", "shortdesc" : "Path to ipmitool binary", - "default" : "#@IPMITOOL_PATH@", + "default" : "@IPMITOOL_PATH@", "order": 200 }
diff --git a/make/fencebuild.mk b/make/fencebuild.mk index 5cbe3bd..14e33b7 100644 --- a/make/fencebuild.mk +++ b/make/fencebuild.mk @@ -9,8 +9,8 @@ $(TARGET): $(SRC) -e 's#@''LOGDIR@#${LOGDIR}#g' \ -e 's#@''SBINDIR@#${sbindir}#g' \ -e 's#@''LIBEXECDIR@#${libexecdir}#g' \ - -e 's#@''IPMITOOL_PATH#${IPMITOOL_PATH}#g' \ - -e 's#@''AMTTOOL_PATH#${AMTTOOL_PATH}#g' \ + -e 's#@''IPMITOOL_PATH@#${IPMITOOL_PATH}#g' \ + -e 's#@''AMTTOOL_PATH@#${AMTTOOL_PATH}#g' \ > $@
if [ 0 -eq `echo "$(SRC)" | grep fence_ &> /dev/null; echo $$?` ]; then \