The branch, 2.5 has been updated via 15f56f68d56b12c775ec8e9d111d003cea455d9b (commit) from 8086fda6426f5f8590c18439f16ad4265692b68d (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5 - Log ----------------------------------------------------------------- commit 15f56f68d56b12c775ec8e9d111d003cea455d9b Author: Martin Schwenke <mar...@meltin.net> Date: Tue Jul 29 15:08:36 2014 +1000 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 (Imported from commit bc59e508d381e6ec2a47eed1e0bc8fc3025904a2) ----------------------------------------------------------------------- Summary of changes: config/events.d/10.interface | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/10.interface b/config/events.d/10.interface index ab20c46..176b6f3 100755 --- a/config/events.d/10.interface +++ b/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 -- CTDB repository