45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From e7aba0f0ccd6f023667f41385f25044a94428ed3 Mon Sep 17 00:00:00 2001
|
|
From: Darren Archibald <darren.archibald@oracle.com>
|
|
Date: Fri, 23 Feb 2024 05:56:06 -0800
|
|
Subject: [PATCH] ignore enslaved interface
|
|
|
|
Changes to ignore all enslaved interfaces.
|
|
https://jira.oci.oraclecorp.com/browse/LINUX-1947
|
|
|
|
Orabug: 30092148
|
|
|
|
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
|
|
---
|
|
cloudinit/net/__init__.py | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
|
|
index c0888f5..b093796 100644
|
|
--- a/cloudinit/net/__init__.py
|
|
+++ b/cloudinit/net/__init__.py
|
|
@@ -335,6 +335,10 @@ def is_netfail_standby(devname, driver=None):
|
|
return True
|
|
|
|
|
|
+def is_slave(devname):
|
|
+ return os.path.exists(sys_dev_path(devname, "master"))
|
|
+
|
|
+
|
|
def is_renamed(devname):
|
|
"""
|
|
/* interface name assignment types (sysfs name_assign_type attribute) */
|
|
@@ -1054,6 +1058,9 @@ def get_interfaces(
|
|
if is_bridge(name):
|
|
filtered_logger("Ignoring bridge interface: %s", name)
|
|
continue
|
|
+ if is_slave(name):
|
|
+ filtered_logger("Ignoring bridge interface: %s", name)
|
|
+ continue
|
|
if filter_vlan and is_vlan(name):
|
|
continue
|
|
if is_bond(name):
|
|
--
|
|
2.31.1
|
|
|