[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-60-g9233988

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  923398888bb839e22951a8dd21187bf3f343eb3d (commit)
      from  89d31da66ca3f15ed3a87851dea5422be949a2e4 (commit)

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


- Log -----------------------------------------------------------------
commit 923398888bb839e22951a8dd21187bf3f343eb3d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Apr 20 12:28:16 2010 +1000

    Backport of patch to handle virtio interfaces correctly.
    (ethtool does not work on these)

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

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


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index 88ab2e9..8cbe222 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -193,14 +193,15 @@ case "$1" in
 		# we dont know how to test ib links
 		;;
 	    *)
-		[ -z "$IFACE" ] || {
-		    /usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
+		[ -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
 			# brought up previously. Bring the interface up and
 			# try again...
-			/sbin/ip link set $IFACE up
-			/usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
+			ip link set $IFACE up
+			ethtool $IFACE | grep -q 'Link detected: yes' || {
 			    echo "ERROR: No link on the public network interface $IFACE"
 			    exit 1
 			}


-- 
CTDB repository