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/packaging | |
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/packaging')
-rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index cb860443e5..83261c5483 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -156,6 +156,11 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/ctdb/events.d/62.cnfs %{_sysconfdir}/ctdb/events.d/70.iscsi %{_sysconfdir}/ctdb/events.d/91.lvs +%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/10.statd.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/20.nfsd.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/30.lockd.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/40.mountd.check +%config(noreplace) %{_sysconfdir}/ctdb/nfs-rpc-checks.d/50.rquotad.check %{_sysconfdir}/ctdb/statd-callout %{_sbindir}/ctdbd %{_bindir}/ctdb |