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 3d1dc63c59047d189d5637fc958f1e236eef39fc..def69a04649aa27877f953ae30b580f05db47e3d 100755 (executable)
--- 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 0b206399d009e69e1dfc326c18babc189a09c724..195f7ffd7801851adfe7a1edd1b4a5fa69c20690 100644 (file)
--- 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=""