[SCM] CTDB repository - branch master updated - ctdb-1.0.103-2-gbf50709

[Ronnie Sahlberg]

The branch, master has been updated
       via  bf50709630df000583f2b0ef0edc177c01d60eaf (commit)
       via  9e1b99221c8f257129641f6eda2795537b7ce9de (commit)
      from  020e2e30e56b9675f345ee62d6bf585396208059 (commit)

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


- Log -----------------------------------------------------------------
commit bf50709630df000583f2b0ef0edc177c01d60eaf
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date:   Thu Nov 5 12:12:06 2009 +1100

    add an extra test for the bond devices and check that there is an active 
slave.
    this to handle the case where all links do have a physical layer, but where 
all slaves have been disabled using ifdown

commit 9e1b99221c8f257129641f6eda2795537b7ce9de
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date:   Wed Nov 4 07:50:26 2009 +1100

    dont verify winbindd is running properly at startup

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

Summary of changes:
 config/events.d/10.interface |    4 ++++
 config/events.d/50.samba     |    6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index 61f7148..9a02b15 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -147,6 +147,10 @@ case $cmd in
            case $IFACE in 
            ethX*|bond*)
                IFACE=`echo $IFACE |sed -e 's/\....$//'`
+               grep -q 'Currently Active Slave: None' /proc/net/bonding/$IFACE 
&& {
+                       echo "ERROR: No active slaves for bond device $IFACE"
+                       exit 1
+               }
                grep -q '^MII Status: up' /proc/net/bonding/$IFACE || {
                        echo "ERROR: public network interface $IFACE is down"
                        exit 1
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 618dca0..814fb9a 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -171,12 +171,6 @@ case $cmd in
                    killall -q -9 winbindd
                }
                service "$CTDB_SERVICE_WINBIND" start
-               sleep 1
-               wbinfo -t || {
-                       echo "ERROR: wbinfo -t returned error during startup. 
Aborting startup event."
-                       echo "ERROR: This may mean that winbindd can not access 
the domaincontroller and thus can not authenticate users."
-                       exit 1
-               }
        }
 
        # start Samba service. Start it reniced, as under very heavy load 


-- 
CTDB repository