From: Martin Schwenke <martin@meltin.net>
Date: Tue, 26 Mar 2019 04:05:58 +0000 (+1100)
Subject: ctdb-scripts: Default to using systemd services in NFS call-out
X-Git-Tag: tdb-1.4.1~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95283bdf2e9ceff2e35af494c79345cfe25c2cf8;p=thirdparty%2Fsamba.git

ctdb-scripts: Default to using systemd services in NFS call-out

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13860

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@samba.org>
---

diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout
index 3d1dc63c590..def69a04649 100755
--- a/ctdb/config/nfs-linux-kernel-callout
+++ b/ctdb/config/nfs-linux-kernel-callout
@@ -14,7 +14,7 @@ nfs_exports_file="${CTDB_NFS_EXPORTS_FILE:-/var/lib/nfs/etab}"
 
 # As above, edit the default value below.  CTDB_NFS_DISTRO_STYLE is a
 # test variable only.
-nfs_distro_style="${CTDB_NFS_DISTRO_STYLE:-sysvinit-redhat}"
+nfs_distro_style="${CTDB_NFS_DISTRO_STYLE:-systemd-redhat}"
 
 case "$nfs_distro_style" in
 systemd-*)
diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/eventscripts/scripts/60.nfs.sh
index 0b206399d00..195f7ffd780 100644
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/60.nfs.sh
@@ -7,7 +7,7 @@ setup ()
 
 	if [ -z "$CTDB_NFS_DISTRO_STYLE" ] ; then
 		# Currently supported: sysvinit-redhat, systemd-redhat
-		CTDB_NFS_DISTRO_STYLE="sysvinit-redhat"
+		CTDB_NFS_DISTRO_STYLE="systemd-redhat"
 	fi
 
 	export FAKE_RPCINFO_SERVICES=""