From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 1 Jun 2007 11:20:05 +0000 (+1000)
Subject: - make symlink relative in install
X-Git-Tag: tevent-0.9.20~348^2~2610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fa2600c8b13cfe4a7d8cc3080f86a997ad38736;p=thirdparty%2Fsamba.git

- 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 c818336498a..2210474c908 100644
--- 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 e6700c0c136..c831bc6567f 100644
--- 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 81c7d06a031..417b6c4b3a5 100644
--- 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