update(): pass sysroot as parameter

Remove duplicated sysroot as `openat::Dir::open("/")` and pass
as a parameter

Author: HuijingHei

src/bootupd.rs

@@ -215,16 +215,15 @@ fn ensure_writable_boot() -> Result<()> {
 }
 
 /// daemon implementation of component update
-pub(crate) fn update(name: &str) -> Result<ComponentUpdateResult> {
+pub(crate) fn update(name: &str, sysroot: &openat::Dir) -> Result<ComponentUpdateResult> {
     let mut state = SavedState::load_from_disk("/")?.unwrap_or_default();
     let component = component::new_from_name(name)?;
     let inst = if let Some(inst) = state.installed.get(name) {
         inst.clone()
     } else {
         anyhow::bail!("Component {} is not installed", name);
     };
-    let sysroot = openat::Dir::open("/")?;
-    let update = component.query_update(&sysroot)?;
+    let update = component.query_update(sysroot)?;
     let update = match update.as_ref() {
         Some(p) if inst.meta.can_upgrade_to(p) => p,
         _ => return Ok(ComponentUpdateResult::AtLatestVersion),
@@ -235,6 +234,7 @@ pub(crate) fn update(name: &str) -> Result<ComponentUpdateResult> {
     let mut pending_container = state.pending.take().unwrap_or_default();
     let interrupted = pending_container.get(component.name()).cloned();
     pending_container.insert(component.name().into(), update.clone());
+    let sysroot = sysroot.try_clone()?;
     let mut state_guard =
         SavedState::acquire_write_lock(sysroot).context("Failed to acquire write lock")?;
     state_guard
@@ -408,7 +408,7 @@ pub(crate) fn print_status(status: &Status) -> Result<()> {
     Ok(())
 }
 
-pub(crate) fn client_run_update() -> Result<()> {
+pub(crate) fn client_run_update(sysroot: &openat::Dir) -> Result<()> {
     crate::try_fail_point!("update");
     let status: Status = status()?;
     if status.components.is_empty() && status.adoptable.is_empty() {
@@ -421,7 +421,7 @@ pub(crate) fn client_run_update() -> Result<()> {
             ComponentUpdatable::Upgradable => {}
             _ => continue,
         };
-        match update(name)? {
+        match update(name, sysroot)? {
             ComponentUpdateResult::AtLatestVersion => {
                 // Shouldn't happen unless we raced with another client
                 eprintln!(
@@ -656,7 +656,8 @@ mod tests {
     fn test_failpoint_update() {
         let guard = fail::FailScenario::setup();
         fail::cfg("update", "return").unwrap();
-        let r = client_run_update();
+        let sysroot = openat::Dir::open("/").expect("open /");
+        let r = client_run_update(&sysroot);
         assert_eq!(r.is_err(), true);
         guard.teardown();
     }

src/cli/bootupctl.rs

@@ -1,8 +1,9 @@
 use crate::bootupd;
-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::Parser;
 use log::LevelFilter;
 
+use std::os::unix::io::AsRawFd;
 use std::os::unix::process::CommandExt;
 use std::process::{Command, Stdio};
 
@@ -129,7 +130,14 @@ impl CtlCommand {
     /// Runner for `update` verb.
     fn run_update() -> Result<()> {
         ensure_running_in_systemd()?;
-        bootupd::client_run_update()
+        let sysroot = openat::Dir::open("/").context("Opening root dir")?;
+        let dest_fd = format!("/proc/self/fd/{}", sysroot.as_raw_fd());
+        let dest_root = std::fs::read_link(dest_fd)?;
+
+        let devices = crate::blockdev::get_devices(&dest_root)
+            .with_context(|| "while looking for parent devices")?;
+        crate::blockdev::init_parent_devices(devices);
+        bootupd::client_run_update(&sysroot)
     }
 
     /// Runner for `update` verb.