[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-54-gba22bcd

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  ba22bcd467bf6ec6184bef71035fc03fb3cc7180 (commit)
       via  1f253c8be425862a42eb2ee424eff8baab49df88 (commit)
      from  8fdf1318ac2b10ab4e95651bdc67c0e0391eae95 (commit)

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


- Log -----------------------------------------------------------------
commit ba22bcd467bf6ec6184bef71035fc03fb3cc7180
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Mar 24 15:54:15 2010 +1100

    New Version    1.0.112-13

commit 1f253c8be425862a42eb2ee424eff8baab49df88
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Mar 24 15:51:02 2010 +1100

    Try to restart NFS if "service nfs start" failed.
    
    BZ61827

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

Summary of changes:
 config/events.d/60.nfs     |    4 +++-
 packaging/RPM/ctdb.spec.in |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 61c8081..3957283 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -77,7 +77,9 @@ case "$1" in
 
 	# check that NFS is running
 	service nfs status 2>/dev/null >/dev/null || {
-		echo NFS is not running
+		echo NFS is not running. Trying to restart NFS.
+		ctdb_service_stop
+		ctdb_service_start
 		exit 1
 	}
 
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 7622300..5843bb2 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 12
+Release: 13
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Wed Mar 25 2010 : Version 1.0.112-13
+ - Try to restart NFS if "service nfs start" failed.
+   BZ 61827
 * Wed Mar 11 2010 : Version 1.0.112-12
  - From christian ambach : drop the loglevel of a vacuuming message
  - From  Wolfgang Mueller-Friedt : fix bug in ctdb_setstatus


-- 
CTDB repository