/etc/ha.d/resource.d needs to be a symlink to PREFIX/sbin/ldirectord
in order for ldrectord to be able to be used as a v1 style resource.
Previously creating this link has been the job of packaging systems.
But sometimes packagers forget, and breakage occurs. It seems
that it would be more logical to just have the build process create
the symlink.
As pointed out to me by Matsuda-san.
Cc: Daiki Matsuda <[EMAIL PROTECTED]>
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
---
Can someone check that the RPM portion of this change this works?
Index: heartbeat/heartbeat.spec.in
===================================================================
--- heartbeat.orig/heartbeat.spec.in 2007-07-17 18:16:14.000000000 +0900
+++ heartbeat/heartbeat.spec.in 2007-07-17 18:21:25.000000000 +0900
@@ -1433,10 +1433,6 @@ make
###########################################################
#make DESTDIR=$RPM_BUILD_ROOT install-strip
make DESTDIR=$RPM_BUILD_ROOT install
-(
- cd [EMAIL PROTECTED]@/ha.d/resource.d
- ln -s @sbindir@/ldirectord ldirectord
-)
%if %{ENABLE_MGMT}
ln -s @libdir@/heartbeat-gui/haclient.py [EMAIL PROTECTED]@/hb_gui
Index: heartbeat/ldirectord/Makefile.am
===================================================================
--- heartbeat.orig/ldirectord/Makefile.am 2007-07-17 18:04:02.000000000
+0900
+++ heartbeat/ldirectord/Makefile.am 2007-07-17 18:14:35.000000000 +0900
@@ -32,5 +32,13 @@ ldirectord.8: ldirectord
sbin_SCRIPTS = ldirectord supervise-ldirectord-config
man_MANS = ldirectord.8 supervise-ldirectord-config.8
-## additional Makefile targets
-# additional installations not covered normally
+harddir = $(sysconfdir)/ha.d/resource.d
+
+.PHONY: install-exec-hook
+install-exec-hook:
+ $(mkinstalldirs) $(DESTDIR)$(harddir)
+ cd $(DESTDIR)$(harddir) && $(LN_S) -f $(sbindir)/ldirectord .
+
+.PHONY: uninstall-hook
+uninstall-hook:
+ rm -f $(DESTDIR)$(harddir)/ldirectord
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
