StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not write any config for a wlan device that has not been given a ESSID 

See https://bugs.launchpad.net/ubuntu/+source/subiquity/+bug/1623756
This commit is contained in:
Michael Hudson-Doyle 2016-09-15 21:29:03 +12:00
parent 85e9545768
commit 36967e2309
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subiquitycore/models/network.py
View File

@ -105,9 +105,9 @@ class Networkdev():
def render(self):
log.debug("render to YAML")
result = { self.ifname:
{
{
'addresses': self.ipv4_addresses + self.ipv6_addresses,
}
}
}
if self.dhcp4:
@ -119,13 +119,14 @@ class Networkdev():
result[self.ifname]['interfaces'] = self.probe_info.bond['slaves']
if self.iftype == 'wlan':
if self.essid is not None:
aps = result[self.ifname]['access-points'] = {}
ap = aps[self.essid] = {
'mode': 'infrastructure',
}
if self.wpa_psk is not None:
ap['password'] = self.wpa_psk
if self.essid is None:
return {}
aps = result[self.ifname]['access-points'] = {}
ap = aps[self.essid] = {
'mode': 'infrastructure',
}
if self.wpa_psk is not None:
ap['password'] = self.wpa_psk
return result