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

.gitignore

@@ -1,7 +1,7 @@
 /target
 /.cargo
 /demo_files/home/root/.ssh/authorized_keys
-/demo_files/var/run/tacd/motd
+/demo_files/run/
 /web/npm-shrinkwrap.json
 /web/oe-logs
 /web/oe-workdir

demo_files/srv/tacd/state.json

@@ -3,6 +3,8 @@
   "persistent_topics": {
     "/v1/tac/display/show_help": false,
     "/v1/tac/setup_mode": false,
-    "/v1/tac/update/enable_polling": true
+    "/v1/tac/update/enable_auto_install": true,
+    "/v1/tac/update/enable_polling": true,
+    "/v1/tac/update/inhibit/dut_power": true
   }
 }

demo_files/usr/lib/rauc/system.conf

@@ -0,0 +1,42 @@
+# WARNING: this file is read by the tacd and used as a template to generate a
+# version with additional update polling configuration.
+# The original file is placed in `/usr/lib/rauc/system.conf`, while the runtime
+# version is placed in `/run/rauc/system.conf`.
+# The latter may not exist if polling is not enabled and thus no special
+# runtime config is required.
+
+[system]
+compatible=Linux Automation GmbH - LXA TAC
+bootloader=barebox
+bundle-formats=-plain
+data-directory=/srv/rauc
+
+[keyring]
+directory=/etc/rauc/certificates-enabled
+
+[handlers]
+system-info=/usr/lib/rauc/system-info-handler.sh
+
+[streaming]
+send-headers=boot-id;system-version;serial;transaction-id;uptime
+
+# <tacd-polling-section>
+
+[slot.rootfs.0]
+device=/dev/disk/by-partuuid/e82e6873-62cc-46fb-90f0-3e936743fa62
+type=ext4
+bootname=system0
+resize=true
+
+[slot.rootfs.1]
+device=/dev/disk/by-partuuid/8eb3e87e-2b4e-45e3-888b-2f678662862d
+type=ext4
+bootname=system1
+resize=true
+
+[slot.bootloader.0]
+device=/dev/mmcblk1
+type=boot-emmc
+
+[log.all-log]
+filename=all-events.log

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,45 @@ 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/inhibit/dut_power:
+    get:
+      summary: Whether the TAC should look for and install updates while the DUT is powered
+      tags: [Updating]
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                type: boolean
+    put:
+      summary: Set whether polling for updates while the DUT is powered is inhibited or not
+      tags: [Updating]
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: boolean
+      responses:
+        '204':
+          description: The configuration was applied
+        '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 +866,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 +1141,14 @@ components:
         nesting_depth:
           type: number
 
+    UpdateRequest:
+      type: object
+      properties:
+        url:
+          type: string
+        manifest_hash:
+          type: string
+
     UpdateChannels:
       type: array
       items:
@@ -1122,15 +1171,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

@@ -335,18 +335,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

@@ -17,6 +17,7 @@
 use async_std::sync::Arc;
 
 use crate::broker::{BrokerBuilder, Topic};
+use crate::inhibit::InhibitFiles;
 use crate::led::BlinkPattern;
 use crate::watched_tasks::WatchedTasksBuilder;
 
@@ -82,18 +83,21 @@ impl DbusSession {
         wtb: &mut WatchedTasksBuilder,
         led_dut: Arc<Topic<BlinkPattern>>,
         led_uplink: Arc<Topic<BlinkPattern>>,
+        inhibit_files: &'static InhibitFiles,
     ) -> 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(), inhibit_files)?,
+            systemd,
         })
     }
 }