eventscripts: Remove special case for virtio_net
authorMartin Schwenke <martin@meltin.net>
Tue, 29 Jul 2014 05:08:36 +0000 (15:08 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Fri, 1 Aug 2014 05:43:49 +0000 (15:43 +1000)
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

(Imported from commit bc59e508d381e6ec2a47eed1e0bc8fc3025904a2)

config/events.d/10.interface

index ab20c46ffaf9bee3d6d847ac879fa586fa4117cf..176b6f3beacbecd96ce925aeb3350438d5503acc 100755 (executable)
@@ -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