- make symlink relative in install

- include ctdb functions in samba and nfslock event scripts

(This used to be ctdb commit 08e2278069346b1fc49774603aa26c68222cf67f)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index c818336498ac847865c9133caa95cc4cd85602b8..2210474c908556f46e54df85d29d985fe3591617 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -124,12 +124,13 @@ install: all
        install -m644 include/ctdb.h $(DESTDIR)$(includedir)
        install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
        install -m755 tools/events $(DESTDIR)$(etcdir)/ctdb
+       install -m755 tools/functions $(DESTDIR)$(etcdir)/ctdb
        install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb
        install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
        install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
        install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
        install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
-       ln -sf $(DESTDIR)$(bindir)/onnode.ssh $(DESTDIR)$(bindir)/onnode
+       cd $(DESTDIR)$(bindir) && ln -sf onnode.ssh onnode
 
 test: all
        tests/run_tests.sh

diff --git a/ctdb/tools/events.d/nfslock b/ctdb/tools/events.d/nfslock
index e6700c0c1368db9cfb7a175db5baa6b2856f74a5..c831bc6567fd0c5f3a9395d637d5c6b5ef785270 100644 (file)
--- a/ctdb/tools/events.d/nfslock
+++ b/ctdb/tools/events.d/nfslock
@@ -2,6 +2,7 @@
 # event strict to manage lockd and statd in a cluster environment
 
 . /etc/sysconfig/ctdb
+. /etc/ctdb/functions
 
 cmd="$1"
 shift

diff --git a/ctdb/tools/events.d/samba b/ctdb/tools/events.d/samba
index 81c7d06a031a46b3becf11816d41886409018dc7..417b6c4b3a59a406f5e44d1681ba0d7d5b8e3e34 100644 (file)
--- a/ctdb/tools/events.d/samba
+++ b/ctdb/tools/events.d/samba
@@ -4,6 +4,7 @@
 PATH=/bin:/usr/bin:$PATH
 
 . /etc/sysconfig/ctdb
+. /etc/ctdb/functions
 
 cmd="$1"
 shift