ctdb-scripts: Default to using systemd services in NFS call-out
authorMartin Schwenke <martin@meltin.net>
Tue, 26 Mar 2019 04:05:58 +0000 (15:05 +1100)
committerMartin Schwenke <martins@samba.org>
Sun, 31 Mar 2019 10:45:20 +0000 (10:45 +0000)
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>
ctdb/config/nfs-linux-kernel-callout
ctdb/tests/eventscripts/scripts/60.nfs.sh

index 3d1dc63c59047d189d5637fc958f1e236eef39fc..def69a04649aa27877f953ae30b580f05db47e3d 100755 (executable)
@@ -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.
 
 # 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-*)
 
 case "$nfs_distro_style" in
 systemd-*)
index 0b206399d009e69e1dfc326c18babc189a09c724..195f7ffd7801851adfe7a1edd1b4a5fa69c20690 100644 (file)
@@ -7,7 +7,7 @@ setup ()
 
        if [ -z "$CTDB_NFS_DISTRO_STYLE" ] ; then
                # Currently supported: sysvinit-redhat, systemd-redhat
 
        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=""
        fi
 
        export FAKE_RPCINFO_SERVICES=""