bootupd way of extending payload to esp

Author: say-paul

src/bios.rs

@@ -224,4 +224,7 @@ impl Component for Bios {
     fn get_efi_vendor(&self, _: &openat::Dir) -> Result<Option<String>> {
         Ok(None)
     }
+    fn extend_payload(&self,_: &str,_: &str) -> Result<Option<bool>> {
+        Ok(None)
+    }
 }

src/cli/bootupctl.rs

@@ -73,6 +73,8 @@ pub enum CtlBackend {
     Generate(super::bootupd::GenerateOpts),
     #[clap(name = "install", hide = true)]
     Install(super::bootupd::InstallOpts),
+    #[clap(name = "extend-payload-to-esp", hide = true)]
+    ExtendPayload(super::bootupd::ExtendPayloadOpts),
 }
 
 #[derive(Debug, Parser)]
@@ -102,6 +104,9 @@ impl CtlCommand {
             CtlVerb::Backend(CtlBackend::Install(opts)) => {
                 super::bootupd::DCommand::run_install(opts)
             }
+            CtlVerb::Backend(CtlBackend::ExtendPayload(opts)) => {
+                super::bootupd::DCommand::run_extend_payload(opts)
+            }
             CtlVerb::MigrateStaticGrubConfig => Self::run_migrate_static_grub_config(),
         }
     }

src/cli/bootupd.rs

@@ -35,6 +35,8 @@ pub enum DVerb {
     GenerateUpdateMetadata(GenerateOpts),
     #[clap(name = "install", about = "Install components")]
     Install(InstallOpts),
+    #[clap(name = "extend-payload-to-esp", about = "Extend bootloader payload with additional files")]
+    ExtendPayload(ExtendPayloadOpts),
 }
 
 #[derive(Debug, Parser)]
@@ -82,12 +84,36 @@ pub struct GenerateOpts {
     sysroot: Option<String>,
 }
 
+#[derive(Debug, Parser)]
+pub struct ExtendPayloadOpts {
+    /// System root directory
+    #[clap(value_parser, default_value_t = String::from("/"))]
+    sysroot: String,
+
+    /// Source directory containing files to add
+    #[clap(value_parser)]
+    src_root: String,
+}
+
+#[derive(Debug, Parser)]
+pub struct InstallToFilesystemOpts {
+    #[clap(long, default_value_t = String::from("/") , help = "Source root directory")]
+    src_root: String,
+
+    #[clap(long, help = "Destination root directory")]
+    dest_root: String,
+
+    #[clap(value_parser, help = "file relative path")]
+    file_path: String,
+}
+
 impl DCommand {
     /// Run CLI application.
     pub fn run(self) -> Result<()> {
         match self.cmd {
             DVerb::Install(opts) => Self::run_install(opts),
             DVerb::GenerateUpdateMetadata(opts) => Self::run_generate_meta(opts),
+            DVerb::ExtendPayload(opts) => Self::run_extend_payload(opts),
         }
     }
 
@@ -122,4 +148,16 @@ impl DCommand {
         .context("boot data installation failed")?;
         Ok(())
     }
+
+    pub(crate) fn run_extend_payload(opts: ExtendPayloadOpts) -> Result<()> {
+        let components = crate::bootupd::get_components();
+        for component in components.values() {
+            if let Some(updated) = component.extend_payload(&opts.sysroot, &opts.src_root)? {
+                if updated {
+                    println!("Extended payload for {} successfully", component.name());
+                }
+            }
+        }
+        Ok(())
+    }
 }

src/component.rs

@@ -75,6 +75,10 @@ pub(crate) trait Component {
 
     /// Locating efi vendor dir
     fn get_efi_vendor(&self, sysroot: &openat::Dir) -> Result<Option<String>>;
+
+    /// Extending payload from input dir
+    fn extend_payload(&self,sysroot: &str,src_root: &str) -> Result<Option<bool>>;
+
 }
 
 /// Given a component name, create an implementation.

src/efi.rs

@@ -415,6 +415,44 @@ impl Component for Efi {
         Ok(meta)
     }
 
+    fn extend_payload(&self,sysroot_path: &str,src_input: &str) -> Result<Option<bool>> {
+        let ostreebootdir = Path::new(sysroot_path).join(ostreeutil::BOOT_PREFIX);
+        let dest_efidir = component_updatedir(sysroot_path, self);
+        
+        // move files to staged updates    
+        if ostreebootdir.exists() {
+            let cruft = ["loader", "grub2"];
+            for p in cruft.iter() {
+                let p = ostreebootdir.join(p);
+                if p.exists() {
+                    std::fs::remove_dir_all(&p)?;
+                }
+            }
+            // mv src data to /usr/lib_bootupd/updates/EFI
+            let efisrc = ostreebootdir.join(src_input);
+            if !efisrc.exists() {
+                bail!("Failed to find {:?}", &efisrc);
+            }
+            Command::new("mv").args([&efisrc, &dest_efidir]).run()?;
+        }
+
+        // canocinal path information parsed
+        let efidir = openat::Dir::open(&dest_efidir)
+            .with_context(|| format!("Opening {}", dest_efidir.display()))?;
+        let files = crate::util::filenames(&efidir)?.into_iter().map(|mut f| {
+            f.insert_str(0, src_input);
+            f
+        });
+        
+        // writes EFI.JSON with the timestamp and version 
+        let meta = packagesystem::query_files(sysroot_path, files)
+        .context("Querying RPM metadata")?;
+        write_update_metadata(sysroot_path, self, &meta)?;
+    
+        Ok(Some(true))
+    
+    }
+
     fn query_update(&self, sysroot: &openat::Dir) -> Result<Option<ContentMetadata>> {
         get_component_update(sysroot, self)
     }