summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2019-03-26 15:05:58 +1100
committerMartin Schwenke <martins@samba.org>2019-03-31 10:45:20 +0000
commit95283bdf2e9ceff2e35af494c79345cfe25c2cf8 (patch)
tree4c80527e9adc6544beedd4e6ecde4ae93ca7427b /ctdb
parent2833ddcfcb780497264e0f412a9ad6e26a9bc657 (diff)
downloadsamba-95283bdf2e9ceff2e35af494c79345cfe25c2cf8.tar.gz
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>
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/config/nfs-linux-kernel-callout2
-rw-r--r--ctdb/tests/eventscripts/scripts/60.nfs.sh2
2 files changed, 2 insertions, 2 deletions
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=""