diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-04-23 12:17:31 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-05-07 12:55:09 +1000 |
| commit | 434f9e8594c24eafe82b02be1e1396f48484bb47 (patch) | |
| tree | daa11e6e6797ea61cdbe1530147d9b843957d29f /ctdb/Makefile.in | |
| parent | 05b2edeec215ada64a0cea50c350f545b334939e (diff) | |
| download | samba-434f9e8594c24eafe82b02be1e1396f48484bb47.tar.gz samba-434f9e8594c24eafe82b02be1e1396f48484bb47.tar.xz samba-434f9e8594c24eafe82b02be1e1396f48484bb47.zip | |
eventscripts: 60.nfs uses nfs_check_rpc_services() to check NFS RPC services
* New directory nfs-rpc-checks.d/ replaces hardcoded rules in 60.nfs
* Installation and packaging additions to handle nfs-rpc-checks.d/
* Unit test updates, including deleting 1 test that sanity checked
test infrastructure
* Test infrastructure changes to use nfs-rpc-checks.d/
Note that this removes support for $CTDB_NFS_SKIP_KNFSD_ALIVE_CHECK in
60.nfs. To get the equivalent behaviour, edit 20.nfsd.check and
remove/comment all lines.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 7e792d6768d9ca420ce3713cb122e63afd594b15)
Diffstat (limited to 'ctdb/Makefile.in')
| -rwxr-xr-x | ctdb/Makefile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 87a3bd32a80..7ffc3dc750d 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -317,6 +317,7 @@ install: all manpages $(PMDA_INSTALL) mkdir -p $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(etcdir)/ctdb mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d + mkdir -p $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d mkdir -p $(DESTDIR)$(docdir)/ctdb ${INSTALLCMD} -m 644 ctdb.pc $(DESTDIR)$(libdir)/pkgconfig ${INSTALLCMD} -m 755 bin/ctdb $(DESTDIR)$(bindir) @@ -355,6 +356,11 @@ install: all manpages $(PMDA_INSTALL) ${INSTALLCMD} -m 755 config/events.d/62.cnfs $(DESTDIR)$(etcdir)/ctdb/events.d ${INSTALLCMD} -m 755 config/events.d/70.iscsi $(DESTDIR)$(etcdir)/ctdb/events.d ${INSTALLCMD} -m 755 config/events.d/91.lvs $(DESTDIR)$(etcdir)/ctdb/events.d + ${INSTALLCMD} -m 644 config/nfs-rpc-checks.d/10.statd.check $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d/ + ${INSTALLCMD} -m 644 config/nfs-rpc-checks.d/20.nfsd.check $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d/ + ${INSTALLCMD} -m 644 config/nfs-rpc-checks.d/30.lockd.check $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d/ + ${INSTALLCMD} -m 644 config/nfs-rpc-checks.d/40.mountd.check $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d/ + ${INSTALLCMD} -m 644 config/nfs-rpc-checks.d/50.rquotad.check $(DESTDIR)$(etcdir)/ctdb/nfs-rpc-checks.d/ ${INSTALLCMD} -m 755 tools/ctdb_diagnostics $(DESTDIR)$(bindir) ${INSTALLCMD} -m 755 tools/onnode $(DESTDIR)$(bindir) if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi |