[SCM] CTDB repository - branch 1.2 updated - ctdb-1.0.114-318-g4a9cccc

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  4a9ccccb8a57e7cc256b167b2d51d3797e23951e (commit)
       via  8451ddb021122e02190d39d530fc5ec750f43186 (commit)
      from  3b75f59c1f2b349ac12d6210553afeb82415752b (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2


- Log -----------------------------------------------------------------
commit 4a9ccccb8a57e7cc256b167b2d51d3797e23951e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Sep 1 15:48:55 2010 +1000

    make sure all statd state directories exist before we try to reference them
    or else tar and friends will throw an error in the log

commit 8451ddb021122e02190d39d530fc5ec750f43186
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Sep 1 13:28:25 2010 +1000

    dont print a lot of log information about shutting down vsftpd

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

Summary of changes:
 config/events.d/40.vsftpd |    2 +-
 config/statd-callout      |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/40.vsftpd b/config/events.d/40.vsftpd
index 7ca7ba8..72190db 100755
--- a/config/events.d/40.vsftpd
+++ b/config/events.d/40.vsftpd
@@ -6,7 +6,7 @@
 service_name="vsftpd"
 # make sure the service is stopped first
 service_start="service $service_name stop > /dev/null 2>&1 ; service $service_name start"
-service_stop="service $service_name stop"
+service_stop="service $service_name stop > /dev/null 2>&1"
 service_reconfigure="service $service_name restart"
 service_fail_limit=2
 service_tcp_ports=21
diff --git a/config/statd-callout b/config/statd-callout
index 461cd81..9808cb9 100755
--- a/config/statd-callout
+++ b/config/statd-callout
@@ -45,6 +45,7 @@ case "$1" in
 			continue
 		} 
 		IP=`echo $LINE | cut -f2 -d:`
+		mkdir -p $CTDB_BASE/state/statd/ip/$IP
 		/bin/rm -f $CTDB_BASE/state/statd/ip/$IP/$2
 	done
 	;;
@@ -58,6 +59,8 @@ case "$1" in
 		} 
 		IP=`echo $LINE | cut -f2 -d:`
 
+		mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
 		rm -f $CTDB_BASE/state/statd/ip/$IP.tar
 		tar cfP $CTDB_BASE/state/statd/ip/$IP.tar $CTDB_BASE/state/statd/ip/$IP
 
@@ -90,6 +93,8 @@ case "$1" in
 		} 
 		IP=`echo $LINE | cut -f2 -d:`
 
+		mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
 		rm -f $CTDB_BASE/state/statd/ip/$IP.rec
 		ctdb pfetch ctdb.tdb statd-state:$IP $CTDB_BASE/state/statd/ip/$IP.rec 2>/dev/null
 		[ "$?" = "0" ] || {


-- 
CTDB repository