Merge pull request coreos#928 from HuijingHei/reuse-parent-devices

update: pass `RootContext` to `run_update()`

Author: cgwalters

src/bios.rs

@@ -2,11 +2,11 @@ use anyhow::{bail, Result};
 #[cfg(target_arch = "powerpc64")]
 use std::borrow::Cow;
 use std::io::prelude::*;
-use std::os::unix::io::AsRawFd;
 use std::path::Path;
 use std::process::Command;
 
 use crate::blockdev;
+use crate::bootupd::RootContext;
 use crate::component::*;
 use crate::model::*;
 use crate::packagesystem;
@@ -176,15 +176,24 @@ impl Component for Bios {
         get_component_update(sysroot, self)
     }
 
-    fn run_update(&self, sysroot: &openat::Dir, _: &InstalledContent) -> Result<InstalledContent> {
-        let updatemeta = self.query_update(sysroot)?.expect("update available");
-        let dest_fd = format!("/proc/self/fd/{}", sysroot.as_raw_fd());
-        let dest_root = std::fs::read_link(dest_fd)?;
-        let device = blockdev::get_single_device(&dest_root)?;
+    fn run_update(&self, sysroot: &RootContext, _: &InstalledContent) -> Result<InstalledContent> {
+        let updatemeta = self
+            .query_update(&sysroot.sysroot)?
+            .expect("update available");
 
-        let dest_root = dest_root.to_string_lossy().into_owned();
-        self.run_grub_install(&dest_root, &device)?;
-        log::debug!("Install grub modules on {device}");
+        let mut parent_devices = sysroot.devices.iter();
+        let Some(parent) = parent_devices.next() else {
+            anyhow::bail!("Failed to find parent device");
+        };
+
+        if let Some(next) = parent_devices.next() {
+            anyhow::bail!(
+                "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}");
 
         let adopted_from = None;
         Ok(InstalledContent {

src/bootupd.rs

@@ -217,7 +217,7 @@ fn ensure_writable_boot() -> Result<()> {
 
 /// daemon implementation of component update
 pub(crate) fn update(name: &str, rootcxt: &RootContext) -> Result<ComponentUpdateResult> {
-    let mut state = SavedState::load_from_disk(&rootcxt.path)?.unwrap_or_default();
+    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()
@@ -244,7 +244,7 @@ pub(crate) fn update(name: &str, rootcxt: &RootContext) -> Result<ComponentUpdat
         .context("Failed to update state")?;
 
     let newinst = component
-        .run_update(&state_guard.sysroot, &inst)
+        .run_update(rootcxt, &inst)
         .with_context(|| format!("Failed to update {}", component.name()))?;
     state.installed.insert(component.name().into(), newinst);
     pending_container.remove(component.name());
@@ -260,7 +260,7 @@ pub(crate) fn update(name: &str, rootcxt: &RootContext) -> Result<ComponentUpdat
 /// daemon implementation of component adoption
 pub(crate) fn adopt_and_update(name: &str, rootcxt: &RootContext) -> Result<ContentMetadata> {
     let sysroot = &rootcxt.sysroot;
-    let mut state = SavedState::load_from_disk(&rootcxt.path)?.unwrap_or_default();
+    let mut state = SavedState::load_from_disk("/")?.unwrap_or_default();
     let component = component::new_from_name(name)?;
     if state.installed.contains_key(name) {
         anyhow::bail!("Component {} is already installed", name);
@@ -414,7 +414,6 @@ pub(crate) fn print_status(status: &Status) -> Result<()> {
 pub struct RootContext {
     pub sysroot: openat::Dir,
     pub path: Utf8PathBuf,
-    #[allow(dead_code)]
     pub devices: Vec<String>,
 }
 

src/component.rs

@@ -10,7 +10,7 @@ use openat_ext::OpenatDirExt;
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 
-use crate::model::*;
+use crate::{bootupd::RootContext, model::*};
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "kebab-case")]
@@ -66,7 +66,7 @@ pub(crate) trait Component {
     /// Used on the client to run an update.
     fn run_update(
         &self,
-        sysroot: &openat::Dir,
+        sysroot: &RootContext,
         current: &InstalledContent,
     ) -> Result<InstalledContent>;
 

src/efi.rs

@@ -19,6 +19,7 @@ use rustix::fd::BorrowedFd;
 use walkdir::WalkDir;
 use widestring::U16CString;
 
+use crate::bootupd::RootContext;
 use crate::filetree;
 use crate::model::*;
 use crate::ostreeutil;
@@ -330,13 +331,14 @@ impl Component for Efi {
 
     fn run_update(
         &self,
-        sysroot: &openat::Dir,
+        sysroot: &RootContext,
         current: &InstalledContent,
     ) -> Result<InstalledContent> {
         let currentf = current
             .filetree
             .as_ref()
             .ok_or_else(|| anyhow::anyhow!("No filetree for installed EFI found!"))?;
+        let sysroot = &sysroot.sysroot;
         let updatemeta = self.query_update(sysroot)?.expect("update available");
         let updated = sysroot
             .sub_dir(&component_updatedirname(self))