diff -ruN ctdb.orig/events.d/06.nfs ctdb/events.d/06.nfs --- ctdb.orig/events.d/06.nfs 2017-01-11 08:55:14.000000000 +0100 +++ ctdb/events.d/06.nfs 2017-12-09 23:39:56.646969002 +0100 @@ -8,7 +8,7 @@ # service_name is used by various functions # shellcheck disable=SC2034 -service_name="nfs" +service_name="nfs-kernel-server" loadconfig service_state_dir=$(ctdb_setup_service_state_dir) || exit $? diff -ruN ctdb.orig/events.d/60.nfs ctdb/events.d/60.nfs --- ctdb.orig/events.d/60.nfs 2017-08-08 08:56:05.000000000 +0200 +++ ctdb/events.d/60.nfs 2017-12-09 23:55:52.330685124 +0100 @@ -8,7 +8,7 @@ # service_name is used by various functions # shellcheck disable=SC2034 -service_name="nfs" +service_name="nfs-kernel-server" loadconfig service_state_dir=$(ctdb_setup_service_state_dir) || exit $? diff -ruN ctdb.orig/functions ctdb/functions --- ctdb.orig/functions 2017-11-15 21:36:05.000000000 +0100 +++ ctdb/functions 2017-12-09 23:40:20.459658972 +0100 @@ -885,7 +885,7 @@ ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD" "httpd" ctdb_compat_managed_service "$CTDB_MANAGES_ISCSI" "iscsi" ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD" "clamd" - ctdb_compat_managed_service "$CTDB_MANAGES_NFS" "nfs" + ctdb_compat_managed_service "$CTDB_MANAGES_NFS" "nfs-kernel-server" t=" $CTDB_MANAGED_SERVICES " diff -ruN ctdb.orig/nfs-linux-kernel-callout ctdb/nfs-linux-kernel-callout --- ctdb.orig/nfs-linux-kernel-callout 2017-01-11 08:55:14.000000000 +0100 +++ ctdb/nfs-linux-kernel-callout 2017-12-09 23:20:47.485692010 +0100 @@ -13,9 +13,9 @@ nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}" # Red Hat -nfs_service="nfs" -nfslock_service="nfslock" -nfs_config="/etc/sysconfig/nfs" +#nfs_service="nfs" +#nfslock_service="nfslock" +#nfs_config="/etc/sysconfig/nfs" # SUSE #nfs_service="nfsserver" @@ -23,9 +23,9 @@ #nfs_config="/etc/sysconfig/nfs" # Debian -#nfs_service="nfs-kernel-server" -#nfslock_service="" -#nfs_config="/etc/default/nfs-kernel-server" +nfs_service="nfs-kernel-server" +nfslock_service="" +nfs_config="/etc/default/nfs-kernel-server" # Override for unit testing if [ -z "$PROCFS_PATH" ] ; then @@ -137,8 +137,8 @@ { basic_stop "nfs" || true basic_start "nfs" - _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_recycle" - if [ "$_f" ] ; then + _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_reuse" + if [ -w "$_f" ] ; then echo 1 >"$_f" fi } diff -ruN ctdb.orig/statd-callout ctdb/statd-callout --- ctdb.orig/statd-callout 2017-02-28 21:04:57.000000000 +0100 +++ ctdb/statd-callout 2017-12-09 23:23:41.754733835 +0100 @@ -21,7 +21,7 @@ } loadconfig ctdb -loadconfig nfs +loadconfig nfs-kernel-server [ -n "$NFS_HOSTNAME" ] || \ die "NFS_HOSTNAME is not configured. statd-callout failed"