Darren, can you please subscribe to the list as a normal subscriber rather than to just the digest, so we can keep this discussion in one thread?
On 2011-05-05 04:47, Darren Thompson wrote: > Florian/Team > > There was an error in the GIT-Hub version that was causing my re-base > attempts to fail, so I was forced to try to bring my "last known good" > version to the same configuration (mostly successful). > > I have since found the error in the GIT-Hub version (the initialisation > section was wrong, the meta-data error was a 'red herring') so have been > found and resolved so I have done an actual re-base now based on the > GIT-Hub version. > > Changes: > > 1. Corrected error in utilisation causing ocf to fail in HB_GUI. That is not an error; the Github version is correct. The path to the ocf-shellfuncs library was recently changed upstream; your installed version is apparently still using the old path. For the Github version to work on your system, you will have to apply the attached patch after you check out. Note that normally people would be building the whole resource-agents package from a git checkout and use _that_ on their test system, but you're not using git, so that option is out for you. Have I mentioned that starting to use git would be a good option? > 2. Added "information" to stop section, to provide more feedback on > container shutdown/stop (and to assist with future development of > "containers using alternate 'init' systems"). Applied and pushed to my lxc branch. Can you confirm that the current version is working for you and passes ocf-tester on your system? Cheers, Florian
diff --git a/heartbeat/lxc b/heartbeat/lxc
index 3b0df91..07e0026 100755
--- a/heartbeat/lxc
+++ b/heartbeat/lxc
@@ -34,8 +34,8 @@
# OCF_RESKEY_config
# Initialization:
-: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
-. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
+: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/resource.d/heartbeat}
+. ${OCF_FUNCTIONS_DIR}/.ocf-shellfuncs
# Set default TRANS_RES_STATE (temporary file to "flag" if resource was stated but not stopped)
TRANS_RES_STATE="${HA_RSCTMP}/${OCF_RESOURCE_INSTANCE}.state"
signature.asc
Description: OpenPGP digital signature
_______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
