Update sysroot to rootcxt to make the var consistent

Author: HuijingHei

src/bios.rs

@@ -159,15 +159,15 @@ impl Component for Bios {
 
     fn adopt_update(
         &self,
-        sysroot: &RootContext,
+        rootcxt: &RootContext,
         update: &ContentMetadata,
     ) -> Result<InstalledContent> {
-        let bios_devices = blockdev::find_colocated_bios_boot(&sysroot.devices)?;
+        let bios_devices = blockdev::find_colocated_bios_boot(&rootcxt.devices)?;
         let Some(meta) = self.query_adopt(&bios_devices)? else {
             anyhow::bail!("Failed to find adoptable system")
         };
 
-        let mut parent_devices = sysroot.devices.iter();
+        let mut parent_devices = rootcxt.devices.iter();
         let Some(parent) = parent_devices.next() else {
             anyhow::bail!("Failed to find parent device");
         };
@@ -177,8 +177,8 @@ impl Component for Bios {
                 "Found multiple parent devices {parent} and {next}; not currently supported"
             );
         }
-        self.run_grub_install(sysroot.path.as_str(), &parent)?;
-        log::debug!("Install grub modules on {parent}");
+        self.run_grub_install(rootcxt.path.as_str(), &parent)?;
+        log::debug!("Installed grub modules on {parent}");
         Ok(InstalledContent {
             meta: update.clone(),
             filetree: None,
@@ -190,12 +190,12 @@ impl Component for Bios {
         get_component_update(sysroot, self)
     }
 
-    fn run_update(&self, sysroot: &RootContext, _: &InstalledContent) -> Result<InstalledContent> {
+    fn run_update(&self, rootcxt: &RootContext, _: &InstalledContent) -> Result<InstalledContent> {
         let updatemeta = self
-            .query_update(&sysroot.sysroot)?
+            .query_update(&rootcxt.sysroot)?
             .expect("update available");
 
-        let mut parent_devices = sysroot.devices.iter();
+        let mut parent_devices = rootcxt.devices.iter();
         let Some(parent) = parent_devices.next() else {
             anyhow::bail!("Failed to find parent device");
         };
@@ -206,7 +206,7 @@ impl Component for Bios {
             );
         }
 
-        self.run_grub_install(sysroot.path.as_str(), &parent)?;
+        self.run_grub_install(rootcxt.path.as_str(), &parent)?;
         log::debug!("Install grub modules on {parent}");
 
         let adopted_from = None;

src/blockdev.rs

@@ -63,7 +63,7 @@ pub fn find_colocated_esps(devices: &Vec<String>) -> Result<Option<Vec<String>>>
     if esps.is_empty() {
         return Ok(None);
     }
-    log::debug!("Find esp partitions: {esps:?}");
+    log::debug!("Found esp partitions: {esps:?}");
     Ok(Some(esps))
 }
 
@@ -93,6 +93,6 @@ pub fn find_colocated_bios_boot(devices: &Vec<String>) -> Result<Option<Vec<Stri
     if bios_boots.is_empty() {
         return Ok(None);
     }
-    log::debug!("Find bios_boot partitions: {bios_boots:?}");
+    log::debug!("Found bios_boot partitions: {bios_boots:?}");
     Ok(Some(bios_boots))
 }

src/component.rs

@@ -34,7 +34,7 @@ pub(crate) trait Component {
     /// Given an adoptable system and an update, perform the update.
     fn adopt_update(
         &self,
-        sysroot: &RootContext,
+        rootcxt: &RootContext,
         update: &ContentMetadata,
     ) -> Result<InstalledContent>;
 
@@ -66,7 +66,7 @@ pub(crate) trait Component {
     /// Used on the client to run an update.
     fn run_update(
         &self,
-        sysroot: &RootContext,
+        rootcxt: &RootContext,
         current: &InstalledContent,
     ) -> Result<InstalledContent>;
 

src/efi.rs

@@ -267,10 +267,10 @@ impl Component for Efi {
     /// Given an adoptable system and an update, perform the update.
     fn adopt_update(
         &self,
-        sysroot: &RootContext,
+        rootcxt: &RootContext,
         updatemeta: &ContentMetadata,
     ) -> Result<InstalledContent> {
-        let esp_devices = blockdev::find_colocated_esps(&sysroot.devices)?;
+        let esp_devices = blockdev::find_colocated_esps(&rootcxt.devices)?;
         let Some(meta) = self.query_adopt(&esp_devices)? else {
             anyhow::bail!("Failed to find adoptable system")
         };
@@ -286,12 +286,12 @@ impl Component for Efi {
                 "Found multiple esp devices {esp} and {next_esp}; not currently supported"
             );
         }
-        let destpath = &self.ensure_mounted_esp(sysroot.path.as_ref(), Path::new(&esp))?;
+        let destpath = &self.ensure_mounted_esp(rootcxt.path.as_ref(), Path::new(&esp))?;
 
         let destdir = &openat::Dir::open(&destpath.join("EFI"))
             .with_context(|| format!("opening EFI dir {}", destpath.display()))?;
         validate_esp(&destdir)?;
-        let updated = sysroot
+        let updated = rootcxt
             .sysroot
             .sub_dir(&component_updatedirname(self))
             .context("opening update dir")?;
@@ -353,22 +353,22 @@ impl Component for Efi {
 
     fn run_update(
         &self,
-        sysroot: &RootContext,
+        rootcxt: &RootContext,
         current: &InstalledContent,
     ) -> Result<InstalledContent> {
         let currentf = current
             .filetree
             .as_ref()
             .ok_or_else(|| anyhow::anyhow!("No filetree for installed EFI found!"))?;
-        let sysroot_dir = &sysroot.sysroot;
+        let sysroot_dir = &rootcxt.sysroot;
         let updatemeta = self.query_update(sysroot_dir)?.expect("update available");
         let updated = sysroot_dir
             .sub_dir(&component_updatedirname(self))
             .context("opening update dir")?;
         let updatef = filetree::FileTree::new_from_dir(&updated).context("reading update dir")?;
         let diff = currentf.diff(&updatef)?;
 
-        let Some(esp_devices) = blockdev::find_colocated_esps(&sysroot.devices)? else {
+        let Some(esp_devices) = blockdev::find_colocated_esps(&rootcxt.devices)? else {
             anyhow::bail!("Failed to find all esp devices");
         };
         let mut devices = esp_devices.iter();
@@ -381,7 +381,7 @@ impl Component for Efi {
                 "Found multiple esp devices {esp} and {next_esp}; not currently supported"
             );
         }
-        let destpath = &self.ensure_mounted_esp(sysroot.path.as_ref(), Path::new(&esp))?;
+        let destpath = &self.ensure_mounted_esp(rootcxt.path.as_ref(), Path::new(&esp))?;
 
         let destdir = &openat::Dir::open(&destpath.join("EFI"))
             .with_context(|| format!("opening EFI dir {}", destpath.display()))?;