Skip to content

install: Use read_file from composefs-boot #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgwalters merged 1 commit into from
Aug 13, 2025
Merged

install: Use read_file from composefs-boot #1507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions crates/lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub(crate) mod osconfig;

use std::collections::HashMap;
use std::fs::create_dir_all;
use std::io::{Read, Write};
use std::io::Write;
use std::os::fd::{AsFd, AsRawFd};
use std::os::unix::fs::symlink;
use std::os::unix::process::CommandExt;
Expand All @@ -40,9 +40,9 @@ use cap_std_ext::cmdext::CapStdExtCommandExt;
use cap_std_ext::prelude::CapStdExtDirExt;
use chrono::prelude::*;
use clap::ValueEnum;
use composefs_boot::bootloader::read_file;
use fn_error_context::context;
use ostree::gio;
use ostree_ext::composefs::tree::RegularFile;
use ostree_ext::composefs::{
fsverity::{FsVerityHashValue, Sha256HashValue},
repository::Repository as ComposefsRepository,
Expand Down Expand Up @@ -1591,24 +1591,6 @@ fn get_booted_bls() -> Result<BLSConfig> {
Err(anyhow::anyhow!("Booted BLS not found"))
}

pub fn read_file<ObjectID: FsVerityHashValue>(
file: &RegularFile<ObjectID>,
repo: &ComposefsRepository<ObjectID>,
) -> Result<Box<[u8]>> {
match file {
RegularFile::Inline(data) => Ok(data.clone()),
RegularFile::External(id, size) => {
let mut data = vec![];
std::fs::File::from(repo.open_object(id)?).read_to_end(&mut data)?;
ensure!(
*size == data.len() as u64,
"File content doesn't have the expected length"
);
Ok(data.into_boxed_slice())
}
}
}

pub(crate) enum BootSetupType<'a> {
/// For initial setup, i.e. install to-disk
Setup((&'a RootSetup, &'a State)),
Expand Down