The branch, master has been updated
via bc59e50 ctdb-eventscripts: Remove special case for virtio_net
from e17c241 param: Add errors for when an s3 context is used incorrectly
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bc59e508d381e6ec2a47eed1e0bc8fc3025904a2
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Jul 29 15:08:36 2014 +1000
ctdb-eventscripts: Remove special case for virtio_net
The current check is incorrect in 2 ways:
* Commit be71a84565e9e7532a77c175732b764d1f42c1cd contained a thinko
that stops virtio_net interfaces from simply being marked up
* virtio_net interfaces can actually be down
virtio_net has supported ethtool since Linux 2.6.29, so just remove
the special case. This means that testing CTDB on very old virtual
machines is not supported.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
Autobuild-User(master): Amitay Isaacs <ami...@samba.org>
Autobuild-Date(master): Thu Jul 31 13:08:47 CEST 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/10.interface | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/10.interface
b/ctdb/config/events.d/10.interface
index 979fa7b..018f767 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -110,11 +110,6 @@ monitor_interfaces()
mark_up $iface
;;
*)
- # Ignore virtio_net devices, assume they're always up
- _driver_path="/sys/class/net/$iface/device/driver"
- _driver=$(basename $(readlink "$_driver_path") 2>/dev/null)
- [ "$_driver" = "virtio_net" ] && continue
-
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
--
Samba Shared Repository
