Merge "Move references to /config to /fiber/config."
diff --git a/conman/connection_manager.py b/conman/connection_manager.py
index 4c3a888..b3e11e6 100755
--- a/conman/connection_manager.py
+++ b/conman/connection_manager.py
@@ -160,7 +160,10 @@
self.logger.debug('Wifi client already started on %s GHz', self.band)
return
- if self._actually_start_client():
+ # /bin/wifi will return 0 if the config hasn't changed, even if it is not
+ # /currently associated, so we need to check self.client_up as well as
+ # /checking that /bin/wifi succeeded.
+ if self._actually_start_client() and self.client_up:
self.wifi.status.connected_to_wlan = True
self.logger.info('Started wifi client on %s GHz', self.band)
diff --git a/conman/interface.py b/conman/interface.py
index 245ca27..fbef47e 100755
--- a/conman/interface.py
+++ b/conman/interface.py
@@ -82,7 +82,7 @@
if 'default' not in self.current_routes():
return False
- cmd = [self.CONNECTION_CHECK, '-I', self.name]
+ cmd = ['timeout', '5', self.CONNECTION_CHECK, '-I', self.name]
if check_acs:
cmd.append('-a')
