eventscript: Use of $NFS_TICKLE_SHARED_DIRECTORY must be after loadconfig.
authorMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:14:50 +0000 (17:14 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:14:50 +0000 (17:14 +1100)
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>
config/events.d/61.nfstickle

index 14794fe3066787f1ef4c4efad485eed3c077ef30..deb796650a85ca352d88095fb9d0b7ba9dd1212b 100755 (executable)
@@ -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