chore: work on new flexible update engine

.cspell.json

@@ -34,6 +34,7 @@
     "buildx",
     "Buildx",
     "camino",
+    "canonicalize",
     "Chunker",
     "cmdline",
     "composability",
@@ -54,6 +55,7 @@
     "GPIO",
     "GRUBENV",
     "Imager",
+    "indexmap",
     "indicatif",
     "libc",
     "libfdisk",
@@ -75,6 +77,7 @@
     "postgresql",
     "Qcow",
     "raspios",
+    "RAUC",
     "rbind",
     "readwrite",
     "repart",

crates/rugpi-common/Cargo.toml

@@ -27,9 +27,15 @@ tracing.workspace = true
 uuid = "1.8.0"
 xscript.workspace = true
 xz2 = "0.1.7"
+indexmap = { version = "2.5.0", features = ["serde"] }
 
 [dev-dependencies]
 clap.workspace = true
 
+[features]
+compat-rauc = []
+compat-mender = []
+default = ["compat-rauc", "compat-mender"]
+
 [lints]
 workspace = true

crates/rugpi-common/src/boot/grub.rs

@@ -1,6 +1,11 @@
 //! Utilities for the Grub boot flow.
 
-use std::{collections::HashMap, fs::File, io::Write, path::Path};
+use std::{
+    collections::HashMap,
+    fs::{self, File},
+    io::Write,
+    path::Path,
+};
 
 use anyhow::bail;
 use sha1::{Digest, Sha1};
@@ -100,9 +105,7 @@ pub fn grub_envblk_encode(values: &HashMap<String, String>) -> Result<String, In
 }
 
 pub fn read_default_partitions(config_partition: &ConfigPartition) -> Anyhow<PartitionSet> {
-    let bootpart_env = grub_envblk_decode(&std::fs::read_to_string(
-        &config_partition.path().join("rugpi/primary.grubenv"),
-    )?)?;
+    let bootpart_env = load_grub_env(config_partition.path().join("rugpi/primary.grubenv"))?;
     let Some(bootpart) = bootpart_env.get(RUGPI_BOOTPART) else {
         bail!("Invalid bootpart environment.");
     };
@@ -159,6 +162,28 @@ pub fn grub_write_defaults(config_path: &Path) -> Anyhow<()> {
     Ok(())
 }
 
+pub type GrubEnv = HashMap<String, String>;
+
+pub fn load_grub_env<P: AsRef<Path>>(path: P) -> Anyhow<GrubEnv> {
+    fn inner(path: &Path) -> Anyhow<GrubEnv> {
+        Ok(grub_envblk_decode(&fs::read_to_string(path)?)?)
+    }
+    inner(path.as_ref())
+}
+
+pub fn save_grub_env<P: AsRef<Path>>(path: P, env: &GrubEnv) -> Anyhow<()> {
+    fn inner(path: &Path, env: &GrubEnv) -> Anyhow<()> {
+        let mut tmp_path = path.to_path_buf();
+        tmp_path.as_mut_os_string().push(".tmp");
+        let mut tmp_file = fs::File::create(&tmp_path)?;
+        tmp_file.write_all(grub_envblk_encode(env)?.as_bytes())?;
+        tmp_file.sync_all()?;
+        fs::rename(&tmp_path, path)?;
+        Ok(())
+    }
+    inner(path.as_ref(), env)
+}
+
 pub fn commit(system: &System) -> Anyhow<()> {
     let mut envblk = HashMap::new();
     match system.hot_partitions() {

crates/rugpi-common/src/disk/blkdev.rs

@@ -212,14 +212,6 @@ pub fn is_block_device<P: AsRef<Path>>(path: P) -> io::Result<bool> {
     inner(path.as_ref())
 }
 
-/// Get the size of a block device.
-///
-/// Directly use [`BlockDevice::size`] instead.
-#[deprecated]
-pub fn get_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
-    BlockDevice::new(path)?.size()
-}
-
 /// Find the block device where a given path resides on.
 ///
 /// Returns [`None`] when the path is not on a block device.

crates/rugpi-common/src/disk/sfdisk.rs

@@ -9,7 +9,10 @@ use anyhow::anyhow;
 use serde::Deserialize;
 use xscript::{read_str, run, Run};
 
-use super::{blkdev, gpt::Guid, mbr, DiskId, NumBlocks, Partition, PartitionTable, PartitionType};
+use super::{
+    blkdev::BlockDevice, gpt::Guid, mbr, DiskId, NumBlocks, Partition, PartitionTable,
+    PartitionType,
+};
 use crate::{utils::units::NumBytes, Anyhow};
 
 /// Path to the `sfdisk` executable.
@@ -21,7 +24,7 @@ pub(crate) fn sfdisk_read(dev: &Path) -> Anyhow<PartitionTable> {
             .partition_table;
     let metadata = dev.metadata()?;
     let size = if metadata.file_type().is_block_device() {
-        NumBlocks::from_raw(blkdev::get_size(dev)? / json_table.sector_size)
+        NumBlocks::from_raw(BlockDevice::new(dev)?.size()? / json_table.sector_size)
     } else {
         NumBlocks::from_raw(metadata.size() / json_table.sector_size)
     };