adopt_and_update(): pass sysroot as parameter

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

Author: HuijingHei

src/bootupd.rs

@@ -256,8 +256,7 @@ pub(crate) fn update(name: &str, sysroot: &openat::Dir) -> Result<ComponentUpdat
 }
 
 /// daemon implementation of component adoption
-pub(crate) fn adopt_and_update(name: &str) -> Result<ContentMetadata> {
-    let sysroot = openat::Dir::open("/")?;
+pub(crate) fn adopt_and_update(name: &str, sysroot: &openat::Dir) -> Result<ContentMetadata> {
     let mut state = SavedState::load_from_disk("/")?.unwrap_or_default();
     let component = component::new_from_name(name)?;
     if state.installed.contains_key(name) {
@@ -269,6 +268,7 @@ pub(crate) fn adopt_and_update(name: &str) -> Result<ContentMetadata> {
     let Some(update) = component.query_update(&sysroot)? else {
         anyhow::bail!("Component {} has no available update", name);
     };
+    let sysroot = sysroot.try_clone()?;
     let mut state_guard =
         SavedState::acquire_write_lock(sysroot).context("Failed to acquire write lock")?;
 
@@ -449,7 +449,7 @@ pub(crate) fn client_run_update(sysroot: &openat::Dir) -> Result<()> {
     }
     for (name, adoptable) in status.adoptable.iter() {
         if adoptable.confident {
-            let r: ContentMetadata = adopt_and_update(name)?;
+            let r: ContentMetadata = adopt_and_update(name, sysroot)?;
             println!("Adopted and updated: {}: {}", name, r.version);
             updated = true;
         } else {
@@ -462,13 +462,13 @@ pub(crate) fn client_run_update(sysroot: &openat::Dir) -> Result<()> {
     Ok(())
 }
 
-pub(crate) fn client_run_adopt_and_update() -> Result<()> {
+pub(crate) fn client_run_adopt_and_update(sysroot: &openat::Dir) -> Result<()> {
     let status: Status = status()?;
     if status.adoptable.is_empty() {
         println!("No components are adoptable.");
     } else {
         for (name, _) in status.adoptable.iter() {
-            let r: ContentMetadata = adopt_and_update(name)?;
+            let r: ContentMetadata = adopt_and_update(name, sysroot)?;
             println!("Adopted and updated: {}: {}", name, r.version);
         }
     }

src/cli/bootupctl.rs

@@ -143,7 +143,14 @@ impl CtlCommand {
     /// Runner for `update` verb.
     fn run_adopt_and_update() -> Result<()> {
         ensure_running_in_systemd()?;
-        bootupd::client_run_adopt_and_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_adopt_and_update(&sysroot)
     }
 
     /// Runner for `validate` verb.