[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  9d49dfa ctdb-scripts: New internal variable CTDB_NFS_CALLOUT_STATE_DIR
      from  12153af s3: dfs: Fix a crash when the dfs targets are disabled.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9d49dfac5f336499131fca5143f0ffdb1932afc9
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Sep 2 09:27:58 2015 +1000

    ctdb-scripts: New internal variable CTDB_NFS_CALLOUT_STATE_DIR
    
    60.nfs sets this to a directory where the NFS callout can store state.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Sep 14 08:36:34 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 ctdb/config/events.d/60.nfs | 3 +++
 1 file changed, 3 insertions(+)


Changeset truncated at 500 lines:

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index 46ed29a..d6b978f 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -18,6 +18,9 @@ fi
 # Always export, for statd callout
 export CTDB_NFS_CALLOUT
 
+# If the callout wants to use this then it must create it
+export CTDB_NFS_CALLOUT_STATE_DIR="${service_state_dir}/callout-state"
+
 nfs_callout_cache="${service_state_dir}/nfs_callout_cache"
 nfs_callout_cache_callout="${nfs_callout_cache}/CTDB_NFS_CALLOUT"
 nfs_callout_cache_ops="${nfs_callout_cache}/ops"


-- 
Samba Shared Repository