Rev 421: - make symlink relative in install in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 421
revision-id: tridge at samba.org-20070601112005-e7vi335p8gcb8i5w
parent: tridge at samba.org-20070601111049-gil5eidqj2uc4tpk
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-06-01 21:20:05 +1000
message:
  - make symlink relative in install
  - include ctdb functions in samba and nfslock event scripts
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  tools/events.d/nfslock         nfslock-20070601105340-vlcvnp6euoj3zdwy-2
  tools/events.d/samba           samba-20070601105340-vlcvnp6euoj3zdwy-3
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-06-01 11:10:49 +0000
+++ b/Makefile.in	2007-06-01 11:20:05 +0000
@@ -124,12 +124,13 @@
 	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

=== modified file 'tools/events.d/nfslock'
--- a/tools/events.d/nfslock	2007-06-01 10:54:26 +0000
+++ b/tools/events.d/nfslock	2007-06-01 11:20:05 +0000
@@ -2,6 +2,7 @@
 # event strict to manage lockd and statd in a cluster environment
 
 . /etc/sysconfig/ctdb
+. /etc/ctdb/functions
 
 cmd="$1"
 shift

=== modified file 'tools/events.d/samba'
--- a/tools/events.d/samba	2007-06-01 10:54:26 +0000
+++ b/tools/events.d/samba	2007-06-01 11:20:05 +0000
@@ -4,6 +4,7 @@
 PATH=/bin:/usr/bin:$PATH
 
 . /etc/sysconfig/ctdb
+. /etc/ctdb/functions
 
 cmd="$1"
 shift