do not listen to udev block events when not interactive

mwhudson · Dec 20, 2019 · a597196 · a597196
1 parent 1e55481
commit a597196
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/subiquity/controllers/filesystem.py b/subiquity/controllers/filesystem.py
@@ -78,7 +78,8 @@ def __init__(self, app):
         self._crash_reports = {}
         self._probe_once_task = SingleInstanceTask(
             self._probe_once, propagate_errors=False)
-        self._probe_task = SingleInstanceTask(self._probe)
+        self._probe_task = SingleInstanceTask(
+            self._probe, propagate_errors=False)
 
     def load_autoinstall_data(self, data):
         log.debug("load_autoinstall_data %s", data)
@@ -92,6 +93,7 @@ def load_autoinstall_data(self, data):
         self.ai_data = data
 
     async def apply_autoinstall_config(self):
+        self.stop_listening_udev()
         await self._start_task
         await self._probe_task.wait()
         if not self.model.is_root_mounted():
@@ -169,7 +171,8 @@ async def _start(self):
         self._monitor = pyudev.Monitor.from_netlink(context)
         self._monitor.filter_by(subsystem='block')
         self._monitor.enable_receiving()
-        self.start_listening_udev()
+        if self.app.interactive():
+            self.start_listening_udev()
         await self._probe_task.start()
 
     def start_listening_udev(self):