diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-07-29 15:08:36 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-07-31 13:08:47 +0200 |
| commit | bc59e508d381e6ec2a47eed1e0bc8fc3025904a2 (patch) | |
| tree | 81a617e3d8316758e2b23a8f738d60c6d0b0b8e6 /ctdb | |
| parent | e17c241711487cd2d203b50fceda83f745b97dc4 (diff) | |
| download | samba-bc59e508d381e6ec2a47eed1e0bc8fc3025904a2.tar.gz | |
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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu Jul 31 13:08:47 CEST 2014 on sn-devel-104
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/config/events.d/10.interface | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface index 979fa7b7e06..018f767e444 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 |