diff options
author | Martin Schwenke <martin@meltin.net> | 2010-01-22 17:14:50 +1100 |
---|---|---|
committer | Martin Schwenke <martin@meltin.net> | 2010-01-22 17:14:50 +1100 |
commit | 407a8f720581f624a0c519b97d9f7e0bde02d524 (patch) | |
tree | 708051ebbe314f198004c797b0ee8e07f2ec4b75 /ctdb/config | |
parent | 02e68340e803bafd4a126740829ec723a97b0848 (diff) | |
download | samba-407a8f720581f624a0c519b97d9f7e0bde02d524.tar.gz samba-407a8f720581f624a0c519b97d9f7e0bde02d524.tar.xz samba-407a8f720581f624a0c519b97d9f7e0bde02d524.zip |
eventscript: Use of $NFS_TICKLE_SHARED_DIRECTORY must be after loadconfig.
Proper fix for 085d1bea78fabf754ef6dd6d323f74a1d361e45c's workaround.
$NFS_TICKLE_SHARED_DIRECTORY was being used before it is set via
loadconfig.
Ronnie actually spotted this one. :-)
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit ee8b2e298351d05197a2e1494f3331433644c1e6)
Diffstat (limited to 'ctdb/config')
-rwxr-xr-x | ctdb/config/events.d/61.nfstickle | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ctdb/config/events.d/61.nfstickle b/ctdb/config/events.d/61.nfstickle index 14794fe306..deb796650a 100755 --- a/ctdb/config/events.d/61.nfstickle +++ b/ctdb/config/events.d/61.nfstickle @@ -3,14 +3,13 @@ . $CTDB_BASE/functions -. /etc/sysconfig/nfs - service_name="nfs" -service_start="mkdir -p $CTDB_BASE/state/nfstickle;mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`;echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle" -service_reconfigure=$service_start loadconfig +service_start="mkdir -p $CTDB_BASE/state/nfstickle;mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`;echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle" +service_reconfigure=$service_start + ctdb_start_stop_service [ -z "$NFS_TICKLE_SHARED_DIRECTORY" ] && exit 0 |