do not show wlan interfaces in server installer

This commit is contained in:
Michael Hudson-Doyle 2018-03-21 09:35:21 +13:00
parent 8287d695dc
commit b3da7266b9
3 changed files with 6 additions and 3 deletions

View File

@ -6,5 +6,5 @@ class ConsoleConfModel:
"""The overall model for console-conf."""
def __init__(self, common):
self.network = NetworkModel()
self.network = NetworkModel(support_wlan=True)
self.identity = IdentityModel()

View File

@ -45,7 +45,7 @@ class SubiquityModel:
self.locale = LocaleModel(common['signal'])
self.keyboard = KeyboardModel(root)
self.installpath = InstallpathModel()
self.network = NetworkModel()
self.network = NetworkModel(support_wlan=False)
self.filesystem = FilesystemModel(common['prober'])
self.identity = IdentityModel()

View File

@ -380,7 +380,8 @@ class NetworkModel(object):
6: 'balance-alb',
}
def __init__(self):
def __init__(self, support_wlan=True):
self.support_wlan = support_wlan
self.devices = {} # Maps ifindex to Networkdev
self.devices_by_name = {} # Maps interface names to Networkdev
self.default_v4_gateway = None
@ -411,6 +412,8 @@ class NetworkModel(object):
def new_link(self, ifindex, link):
if link.type in NETDEV_IGNORED_IFACE_TYPES:
return
if not self.support_wlan and link.type == "wlan":
return
if link.name in NETDEV_IGNORED_IFACE_NAMES:
return
if link.is_virtual: