[SCM] CTDB repository - branch master updated - ctdb-1.0.114-20-g3044d07

[Ronnie Sahlberg]

The branch, master has been updated
       via  3044d07da2a58260fa06bf489890b279bcf3ec39 (commit)
       via  2ea0a9f1a93781a0d036feb9fcc0d120b182922f (commit)
       via  25cfa2aafd653c948430aae8729d293c86a6a68c (commit)
       via  4fb662bba6d96d4c04dadd9f908c4184ef4e969a (commit)
       via  da5cd6d4231d01e6a55090ce737dc44e66916625 (commit)
      from  2a79d976f975ec1ecbd06c210cbb5e6a93068cec (commit)

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


- Log -----------------------------------------------------------------
commit 3044d07da2a58260fa06bf489890b279bcf3ec39
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 20 10:52:31 2010 +1000

    Fix a thinko in 2ea0a9f1a93781a0d036feb9fcc0d120b182922f.
    
    If the driver is virtio_net then we assume that the link is up rather
    than ignoring the check altogether.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 2ea0a9f1a93781a0d036feb9fcc0d120b182922f
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Thu Apr 15 16:38:19 2010 +1000

    ethtool does not support virtio_net devices.
    
    Skip link test for this type of devices
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 25cfa2aafd653c948430aae8729d293c86a6a68c
Merge: 4fb662bba6d96d4c04dadd9f908c4184ef4e969a 2a79d976f975ec1ecbd06c210cbb5e6a93068cec
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Apr 15 13:45:50 2010 +1000

    Merge branch 'master' of git://git.samba.org/sahlberg/ctdb

commit 4fb662bba6d96d4c04dadd9f908c4184ef4e969a
Merge: da5cd6d4231d01e6a55090ce737dc44e66916625 5ed7d6788b8f7bf71d7d66c3a620b1aec54dfd81
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Mar 31 17:52:42 2010 +1100

    Merge commit 'origin/master'

commit da5cd6d4231d01e6a55090ce737dc44e66916625
Author: Wolfgang Mueller-Friedt <wolfmuel at de.ibm.com>
Date:   Wed Mar 10 10:39:31 2010 +0100

    ctdb_setstatus in /etc/ctdb/functions was not working correctly because it was called with a wrong parameter list

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

Summary of changes:
 config/events.d/10.interface |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index d7abc18..fdb1557 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -80,7 +80,8 @@ monitor_interfaces()
 		# we dont know how to test ib links
 		;;
 	    *)
-		[ -z "$IFACE" ] || {
+		[ -z "$IFACE" ] {
+		    [ "$(basename $(readlink /sys/class/net/$IFACE/device/driver))" = virtio_net ] ||
 		    ethtool $IFACE | grep -q 'Link detected: yes' || {
 			# On some systems, this is not successful when a
 			# cable is plugged but the interface has not been


-- 
CTDB repository