dbus: rauc: replace tacd-based update polling with native update polling

src/dbus.rs

@@ -82,6 +82,7 @@ impl DbusSession {
         wtb: &mut WatchedTasksBuilder,
         led_dut: Arc<Topic<BlinkPattern>>,
         led_uplink: Arc<Topic<BlinkPattern>>,
+        setup_mode: Arc<Topic<bool>>,
     ) -> anyhow::Result<Self> {
         let tacd = Tacd::new();
 
@@ -94,7 +95,7 @@ impl DbusSession {
         Ok(Self {
             hostname: Hostname::new(bb, wtb, &conn)?,
             network: Network::new(bb, wtb, &conn, led_dut, led_uplink)?,
-            rauc: Rauc::new(bb, wtb, &conn, systemd.rauc.clone())?,
+            rauc: Rauc::new(bb, wtb, &conn, systemd.rauc.clone(), setup_mode)?,
             systemd,
         })
     }

src/dbus/rauc.rs

@@ -207,6 +207,7 @@ async fn channel_list_update_task(
     reload: Arc<Topic<bool>>,
     enable_polling: Arc<Topic<bool>>,
     enable_auto_install: Arc<Topic<bool>>,
+    setup_mode: Arc<Topic<bool>>,
     channels: Arc<Topic<Channels>>,
     rauc_service: Service,
 ) -> Result<()> {
@@ -215,9 +216,11 @@ async fn channel_list_update_task(
     let (reload_stream, _) = reload.subscribe_unbounded();
     let (mut enable_polling_stream, _) = enable_polling.subscribe_unbounded();
     let (mut enable_auto_install_stream, _) = enable_auto_install.subscribe_unbounded();
+    let (mut setup_mode_stream, _) = setup_mode.subscribe_unbounded();
 
     let mut enable_polling = enable_polling_stream.next().await.unwrap_or(false);
     let mut enable_auto_install = enable_auto_install_stream.next().await.unwrap_or(false);
+    let mut setup_mode = setup_mode_stream.next().await.unwrap_or(true);
 
     'reload_loop: loop {
         futures::select! {
@@ -232,6 +235,9 @@ async fn channel_list_update_task(
             enable_auto_install_new = enable_auto_install_stream.recv().fuse() => {
                 enable_auto_install = enable_auto_install_new?;
             }
+            setup_mode_new = setup_mode_stream.recv().fuse() => {
+                setup_mode = setup_mode_new?;
+            }
         };
 
         // Read the list of available update channels
@@ -243,8 +249,12 @@ async fn channel_list_update_task(
             }
         };
 
-        let should_reload =
-            update_system_conf(new_channels.primary(), enable_polling, enable_auto_install)?;
+        let should_reload = update_system_conf(
+            new_channels.primary(),
+            enable_polling,
+            enable_auto_install,
+            setup_mode,
+        )?;
 
         channels.set(new_channels);
 
@@ -329,6 +339,7 @@ impl Rauc {
         wtb: &mut WatchedTasksBuilder,
         _conn: &Arc<Connection>,
         rauc_service: Service,
+        setup_mode: Arc<Topic<bool>>,
     ) -> Result<Self> {
         let inst = Self::setup_topics(bb);
 
@@ -344,6 +355,7 @@ impl Rauc {
                 inst.reload.clone(),
                 inst.enable_polling.clone(),
                 inst.enable_auto_install.clone(),
+                setup_mode,
                 inst.channels.clone(),
                 rauc_service,
             ),
@@ -358,6 +370,7 @@ impl Rauc {
         wtb: &mut WatchedTasksBuilder,
         conn: &Arc<Connection>,
         rauc_service: Service,
+        setup_mode: Arc<Topic<bool>>,
     ) -> Result<Self> {
         let inst = Self::setup_topics(bb);
 
@@ -613,6 +626,7 @@ impl Rauc {
                 inst.reload.clone(),
                 inst.enable_polling.clone(),
                 inst.enable_auto_install.clone(),
+                setup_mode,
                 inst.channels.clone(),
                 rauc_service,
             ),

src/dbus/rauc/system_conf.rs

@@ -74,6 +74,7 @@ pub fn update_system_conf(
     primary_channel: Option<&Channel>,
     enable_polling: bool,
     enable_auto_install: bool,
+    setup_mode: bool,
 ) -> std::io::Result<bool> {
     let dynamic_conf = {
         // Allow force-enabling update polling and automatic installations
@@ -86,8 +87,13 @@ pub fn update_system_conf(
             .and_then(|pc| pc.force_auto_install)
             .unwrap_or(false);
 
+        // Allow polling for updates, but not automatically installing them
+        // while the user is still in setup mode.
+        // Otherwise they may unbox a TAC, click through the setup process,
+        // activate auto installation, and then an installation starts in the
+        // background without them even noticing.
         let polling = enable_polling || force_polling;
-        let auto_install = enable_auto_install || force_auto_install;
+        let auto_install = (enable_auto_install || force_auto_install) && !setup_mode;
 
         match poll_section(primary_channel, polling, auto_install) {
             Ok(Some(ps)) => {

src/main.rs

@@ -107,9 +107,23 @@ async fn init(screenshooter: ScreenShooter) -> Result<(Ui, WatchedTasksBuilder)>
         adc.iobus_curr.fast.clone(),
         adc.iobus_volt.fast.clone(),
     )?;
+
+    // Set up a http server and provide some static files like the web
+    // interface and config files that may be edited inside the web ui.
+    let mut http_server = HttpServer::new();
+
+    // Allow editing some aspects of the TAC configuration when in "setup mode".
+    let setup_mode = SetupMode::new(&mut bb, &mut wtb, &mut http_server.server)?;
+
     let (hostname, network, rauc, systemd) = {
-        let dbus =
-            DbusSession::new(&mut bb, &mut wtb, led.eth_dut.clone(), led.eth_lab.clone()).await?;
+        let dbus = DbusSession::new(
+            &mut bb,
+            &mut wtb,
+            led.eth_dut.clone(),
+            led.eth_lab.clone(),
+            setup_mode.setup_mode.clone(),
+        )
+        .await?;
 
         (dbus.hostname, dbus.network, dbus.rauc, dbus.systemd)
     };
@@ -123,13 +137,6 @@ async fn init(screenshooter: ScreenShooter) -> Result<(Ui, WatchedTasksBuilder)>
     // (if requested on start).
     let watchdog = Watchdog::new(dut_pwr.tick());
 
-    // Set up a http server and provide some static files like the web
-    // interface and config files that may be edited inside the web ui.
-    let mut http_server = HttpServer::new();
-
-    // Allow editing some aspects of the TAC configuration when in "setup mode".
-    let setup_mode = SetupMode::new(&mut bb, &mut wtb, &mut http_server.server)?;
-
     // Expose a live log of the TAC's systemd journal so it can be viewed
     // in the web interface.
     journal::serve(&mut http_server.server);