diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2011-10-15 19:42:45 +0200 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-11-08 16:31:15 +1100 |
| commit | 4617a0e9cf6ed7771b20b1221a783cf4837c478a (patch) | |
| tree | 1ac7cdd2d58c33f8810fb0154670c90e0210b10f /ctdb/tests/complex | |
| parent | 91431262be2bcc036e511f4a3d6e003dba9002a1 (diff) | |
| download | samba-4617a0e9cf6ed7771b20b1221a783cf4837c478a.tar.gz samba-4617a0e9cf6ed7771b20b1221a783cf4837c478a.tar.xz samba-4617a0e9cf6ed7771b20b1221a783cf4837c478a.zip | |
config can be in /etc/default/ instead of /etc/sysconfig/
... on Debian system and derivated.
(ctdb_diagnostics still hardcodes /etc/sysconfig/)
(This used to be ctdb commit 1341329f6125d491b82c873f793af819e677f714)
Diffstat (limited to 'ctdb/tests/complex')
| -rwxr-xr-x | ctdb/tests/complex/31_nfs_tickle.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh index 030e34fe02..dcbd4d77b2 100755 --- a/ctdb/tests/complex/31_nfs_tickle.sh +++ b/ctdb/tests/complex/31_nfs_tickle.sh @@ -83,7 +83,13 @@ sleep_for "${out#*= }" if try_command_on_node any "test -r /etc/ctdb/events.d/61.nfstickle" ; then echo "Trying to determine NFS_TICKLE_SHARED_DIRECTORY..." - f="/etc/sysconfig/nfs" + if [ -f /etc/sysconfig/nfs ]; then + f="/etc/sysconfig/nfs" + elif [ -f /etc/default/nfs ]; then + f="/etc/default/nfs" + elif [ -f /etc/ctdb/sysconfig/nfs ]; then + f="/etc/ctdb/sysconfig/nfs" + fi try_command_on_node -v any "[ -r $f ] && sed -n -e s@^NFS_TICKLE_SHARED_DIRECTORY=@@p $f" || true nfs_tickle_shared_directory="${out:-/gpfs/.ctdb/nfs-tickles}" |