# Conflicts:
#	compose.yaml
#	updater/service.py

@@ -0,0 +270,4 @@
+
+
+async def test_a_line_with_fewer_fields_than_asked_for_is_skipped() -> None:
+	"""nmcli prints the odd warning of its own, and it is not a device."""

@@ -0,0 +66,4 @@
+	passphrase: str
+
+
+async def run_nmcli(*arguments: str) -> str:

@@ -0,0 +136,4 @@
+		)
+		wireless: Uplink | None = None
+		for line in listing.splitlines():
+			fields = _fields(line)

@@ -0,0 +166,4 @@
+			# Never `connection modify ... autoconnect no` to go with this: the
+			# profile's autoconnect is what recovers the Pi after a power cut,
+			# with the updater out of the picture entirely.
+			await self._nmcli("connection", "down", uplink.connection)

@@ -0,0 +184,4 @@
+				passphrase,
+			)
+			hotspot = Hotspot(await self._address(), HOTSPOT_SSID, passphrase)
+		except RadioError:

@@ -0,0 +199,4 @@
+		service stopping, and more than one of them can arrive.
+		"""
+		self._disarm()
+		await self._remove_hotspot()

@@ -0,0 +200,4 @@
+		"""
+		self._disarm()
+		await self._remove_hotspot()
+		suspended, self._suspended = self._suspended, None

@@ -33,3 +35,4 @@
 	"""
 	loop = asyncio.get_running_loop()
 	stop = asyncio.Event()
+	radio = Radio() if radio is None else radio

@@ -39,2 +42,4 @@
+		await radio.clear_stale_hotspot()
 		await serve(settings, stop)
 	finally:
+		await radio.restore()

@@ -0,0 +33,4 @@
+RESTORE_AFTER = timedelta(minutes=15)
+"""How long the access point may stand before the uplink comes back regardless."""
+
+NMCLI_TIMEOUT = timedelta(seconds=20)

@@ -0,0 +36,4 @@
+NMCLI_TIMEOUT = timedelta(seconds=20)
+"""How long one nmcli may take.
+
+Its own default wait is 90 seconds, which outlasts the `stop_grace_period` a

@@ -0,0 +153,4 @@
+			return
+		_LOGGER.warning("Cleared a %s left by an earlier run", HOTSPOT_CONNECTION)
+		try:
+			await self._nmcli("device", "connect", self._device)

@@ -0,0 +238,4 @@
+		finally:
+			if self._suspended is not None:
+				await self._nmcli("connection", "up", self._suspended.connection)
+				_LOGGER.info("Uplink %s is back", self._suspended.connection)

@@ -36,3 +39,4 @@
 	for number in STOP_SIGNALS:
 		loop.add_signal_handler(number, stop.set)
 	try:
+		await radio.clear_stale_hotspot()

@@ -0,0 +217,4 @@
+			# profile's autoconnect is what recovers the Pi after a power cut,
+			# with the updater out of the picture entirely.
+			await self._nmcli("connection", "down", uplink.connection)
+			self._suspended = uplink

@@ -0,0 +170,4 @@
+			# Dropped rather than retried next start: a profile that will not
+			# come up now will not come up then either, and the note would
+			# outlive the reason for it.
+			_LOGGER.exception("Could not bring %s back", noted)

@@ -0,0 +212,4 @@
+			# Noted before it goes anywhere: if the note cannot be written, the
+			# uplink stays up and the update does not happen, which is the way
+			# round that leaves the Pi reachable.
+			self._remember(uplink)

@@ -36,3 +39,4 @@
 	for number in STOP_SIGNALS:
 		loop.add_signal_handler(number, stop.set)
 	try:
+		await radio.recover()