Merge branch 'b2.1' into journaled_data

opensvc · Nov 25, 2020 · a8344cf · a8344cf
2 parents e43ecfc + 75d862a
commit a8344cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/opensvc/drivers/check/eth/linux.py b/opensvc/drivers/check/eth/linux.py
@@ -16,7 +16,8 @@ def get_intf(self):
             intf += self.add_slaves(bond)
         ifconfig = utilities.ifconfig.Ifconfig()
         for i in ifconfig.intf:
-            if not i.name.startswith('eth'):
+            if not i.name.startswith("eth") and \
+               not i.name.startswith("en"):
                 continue
             if len(i.ipaddr) == 0 and len(i.ip6addr) == 0:
                 continue

diff --git a/opensvc/drivers/check/raid/__init__.py b/opensvc/drivers/check/raid/__init__.py