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

fix some more assorted small wlan problems

This commit is contained in:
Michael Hudson-Doyle 2021-06-09 15:28:06 +12:00
parent 21058464fd
commit 7b3bb0278b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subiquitycore/controllers/network.py
View File

@ -447,7 +447,8 @@ class BaseNetworkController(BaseController):
def set_wlan(self, dev_name: str, wlan: WLANConfig) -> None:
device = self.model.get_netdev_by_name(dev_name)
if wlan.ssid and not device.configured_ssid:
cur_ssid, cur_psk = device.configured_ssid
if wlan.ssid and not cur_ssid:
# Turn DHCP4 on by default when specifying an SSID for
# the first time...
device.config['dhcp4'] = True

6
subiquitycore/ui/views/network_configure_wlan_interface.py
View File

@ -116,7 +116,7 @@ class NetworkConfigureWLANStretchy(Stretchy):
networks_btn = disabled(menu_btn("No visible networks"))
scan_state = self.dev_info.wlan.scan_state
if scan_state:
if not scan_state:
scan_btn = menu_btn("Scan for networks", on_press=self.start_scan)
elif scan_state.startswith('error'):
self.error.set_text('scan failed: %s' % (scan_state,))
@ -155,8 +155,8 @@ class NetworkConfigureWLANStretchy(Stretchy):
else:
psk = None
self.parent.controller.set_wlan(
self.dev_info, WLANConfig(ssid=ssid, psk=psk))
self.parent.update_link(self.dev_info.name)
self.dev_info.name, WLANConfig(ssid=ssid, psk=psk))
self.parent.update_link(self.dev_info)
self.parent.remove_overlay()
def cancel(self, sender=None):