re-sync to 1.0.112-39 srpm

diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index ac34a24d63546db4a27ea577764eb511e0e04780..2fc232a78514daa5d2d9ec639d23a2f34e090511 100755 (executable)
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -77,10 +77,8 @@ case "$1" in
                # We do this so that the ip address will exist on a
                # non-loopback interface so that samba may send it along in the
                # KDC requests.
+               ip addr add $CTDB_NATGW_PUBLIC_IP_HOST dev lo scope host
                ip route add 0.0.0.0/0 via $NATGWIP metric 10
-               # Make sure winbindd does not stay bound to this address
-               # if we are no longer natgwmaster
-               smbcontrol winbindd ip-dropped $CTDB_NATGW_PUBLIC_IP >/dev/null 2>/dev/null
        fi
 
        # flush our route cache

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 2c48d0561b58194f2f6c9c64a00332b2d14bd2dc..645b3b19494f0a97e4517593de53e890ea34b1e1 100755 (executable)
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -96,6 +96,7 @@ case "$1" in
        (ctdb_check_rpc "lockd" 100021 1)
        [ $? = "0" ] || {
            echo "Trying to restart lock manager service"
+           startstop_nfs restart
            startstop_nfslock restart
            exit 1
        }

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 0adb693a7ad572d38564580e5e17b7a685672477..9f3c0526ef21ae9d277fea0639f470c019167ce0 100644 (file)
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 38
+Release: 39
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Wed Oct 27 2010 : Version 1.0.112-39
+ - When restarting lockmanager, also restart nfs itself in case nfs failed to 
+   start.
 * Wed Oct 14 2010 : Version 1.0.112-38
  - Try to restart LOCKD if "service nfslock start" fails.
 * Wed Oct 13 2010 : Version 1.0.112-37