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

openapi.yaml

@@ -697,6 +697,7 @@ paths:
             - network-manager
             - labgrid-exporter
             - lxa-iobus
+            - rauc
     put:
       summary: Perform an action on a systemd service
       tags: [System]
@@ -722,6 +723,7 @@ paths:
             - network-manager
             - labgrid-exporter
             - lxa-iobus
+            - rauc
     get:
       summary: Get the status of a systemd service
       tags: [System]
@@ -773,6 +775,21 @@ paths:
         '400':
           description: The value could not be parsed as boolean
 
+  /v1/tac/update/enable_auto_install:
+    put:
+      summary: Enable automatic installation of operating system updates
+      tags: [Updating]
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: boolean
+      responses:
+        '204':
+          description: Automatic installation of updates was enabled/disabled
+        '400':
+          description: The value could not be parsed as boolean
+
   /v1/tac/update/operation:
     get:
       summary: Get the currently running system update operation
@@ -825,12 +842,12 @@ paths:
         content:
           application/json:
             schema:
-              type: string
+              $ref: '#/components/schemas/UpdateRequest'
       responses:
         '204':
-          description: The value was parsed as string and will be tried
+          description: The value was parsed successfully and will be tried
         '400':
-          description: The value could not be parsed as string
+          description: The value could not be parsed
 
   /v1/tac/update/channels:
     get:
@@ -1100,6 +1117,14 @@ components:
         nesting_depth:
           type: number
 
+    UpdateRequest:
+      type: object
+      properties:
+        url:
+          type: string
+        manifest_hash:
+          type: string
+
     UpdateChannels:
       type: array
       items:
@@ -1122,15 +1147,31 @@ components:
                 type: integer
           enabled:
             type: boolean
+          primary:
+            type: boolean
           bundle:
             type: object
             properties:
               compatible:
                 type: string
               version:
                 type: string,
+              manifest_hash:
+                type: string,
+              effective_url:
+                type: string,
               newer_than_installed:
                 type: boolean
+          force_polling:
+            type: boolean
+          force_auto_install:
+            type: boolean
+          candidate_criteria:
+            type: string
+          install_criteria:
+            type: string
+          reboot_criteria:
+            type: string
 
     ServiceStatus:
       type: object

src/broker/topic.rs

@@ -336,18 +336,6 @@ impl<E: Serialize + DeserializeOwned + Clone + PartialEq> Topic<E> {
 
         self.modify(|prev| if prev != msg { msg } else { None });
     }
-
-    /// Wait until the topic is set to the specified value
-    pub async fn wait_for(self: &Arc<Self>, val: E) {
-        let (mut stream, sub) = self.clone().subscribe_unbounded();
-
-        // Unwrap here to keep the interface simple. The stream could only yield
-        // None if the sender side is dropped, which will not happen as we hold
-        // an Arc to self which contains the senders vec.
-        while stream.next().await.unwrap() != val {}
-
-        sub.unsubscribe()
-    }
 }
 
 impl<E: Serialize + DeserializeOwned + Clone + Not + Not<Output = E>> Topic<E> {

src/dbus.rs

@@ -82,18 +82,21 @@ 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();
 
         let conn_builder = ConnectionBuilder::system()?.name("de.pengutronix.tacd")?;
 
         let conn = Arc::new(tacd.serve(conn_builder).build().await?);
 
+        let systemd = Systemd::new(bb, wtb, &conn).await?;
+
         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: Systemd::new(bb, wtb, &conn).await?,
+            rauc: Rauc::new(bb, wtb, &conn, systemd.rauc.clone(), setup_mode)?,
+            systemd,
         })
     }
 }