commit 77cce7cd52503f83e67e6d937183db30b6e47c1e Author: Christine Caulfield <ccaulfie@redhat.com> Date: Wed Mar 10 09:40:01 2010 +0000 fence: Problems with -V in fence_sanbox and fence_vmware fix for rhbz#549113 Signed-off-by: Marek 'marx' Grac <mgrac@redhat.com> Signed-off-by: Christine Caulfield <ccaulfie@redhat.com> diff --git a/fence/agents/sanbox2/Makefile b/fence/agents/sanbox2/Makefile index 9428344..f6d84bb 100644 --- a/fence/agents/sanbox2/Makefile +++ b/fence/agents/sanbox2/Makefile @@ -22,9 +22,9 @@ all: $(TARGET) $(TARGET): $(SOURCE) : > $(TARGET) awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET) - echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) - ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET) - echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET) + echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET) + ${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET) + echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET) awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET) chmod +x $(TARGET) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 0d16ad9..7e51df5 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -23,7 +23,7 @@ # import sys, re, pexpect, exceptions -sys.path.append("/usr/bin/fence") +sys.path.append("/usr/lib/fence") from fencing import * #BEGIN_VERSION_GENERATION