Skip to content

etc-merge: Create directory in new_etc if deleted #1931

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

Open
Johan-Liebert1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

etc-merge: Create directory in new_etc if deleted #1931

Show file tree
Hide file tree
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
74 changes: 55 additions & 19 deletions crates/etc-merge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ fn get_deletions(
fn get_modifications(
pristine: &Directory<CustomMetadata>,
current: &Directory<CustomMetadata>,
new: &Directory<CustomMetadata>,
mut current_path: PathBuf,
diff: &mut Diff,
) -> anyhow::Result<()> {
Expand All @@ -205,7 +206,21 @@ fn get_modifications(
diff.modified.push(current_path.clone());
}

get_modifications(old_dir, &curr_dir, current_path.clone(), diff)?
let total_added = diff.added.len();
let total_modified = diff.modified.len();

get_modifications(old_dir, &curr_dir, new, current_path.clone(), diff)?;

// This directory or its contents were modified/added
// Check if the new directory was deleted from new_etc
// If it was, we want to add the directory back
if new.get_directory_opt(&current_path.as_os_str())?.is_none() {
if diff.added.len() != total_added {
diff.added.insert(total_added, current_path.clone());
} else if diff.modified.len() != total_modified {
diff.modified.insert(total_modified, current_path.clone());
}
}
}

Err(ImageError::NotFound(..)) => {
Expand Down Expand Up @@ -343,6 +358,7 @@ pub fn traverse_etc(
pub fn compute_diff(
pristine_etc_files: &Directory<CustomMetadata>,
current_etc_files: &Directory<CustomMetadata>,
new_etc_files: &Directory<CustomMetadata>,
) -> anyhow::Result<Diff> {
let mut diff = Diff {
added: vec![],
Expand All @@ -353,6 +369,7 @@ pub fn compute_diff(
get_modifications(
&pristine_etc_files,
&current_etc_files,
&new_etc_files,
PathBuf::new(),
&mut diff,
)?;
Expand Down Expand Up @@ -641,7 +658,7 @@ fn merge_leaf(
} else {
current_etc_fd
.copy(&file, new_etc_fd, &file)
.context(format!("Copying file {file:?}"))?;
.with_context(|| format!("Copying file {file:?}"))?;
};

rustix::fs::chownat(
Expand Down Expand Up @@ -719,7 +736,7 @@ pub fn merge(
current_etc_dirtree: &Directory<CustomMetadata>,
new_etc_fd: &CapStdDir,
new_etc_dirtree: &Directory<CustomMetadata>,
diff: Diff,
diff: &Diff,
) -> anyhow::Result<()> {
merge_modified_files(
&diff.added,
Expand All @@ -739,7 +756,7 @@ pub fn merge(
)
.context("Merging modified files")?;

for removed in diff.removed {
for removed in &diff.removed {
let stat = new_etc_fd.metadata_optional(&removed)?;

let Some(stat) = stat else {
Expand Down Expand Up @@ -779,7 +796,7 @@ mod tests {
];

#[test]
fn test_etc_diff() -> anyhow::Result<()> {
fn test_etc_diff_plus_merge() -> anyhow::Result<()> {
let tempdir = cap_std_ext::cap_tempfile::tempdir(cap_std::ambient_authority())?;

tempdir.create_dir("pristine_etc")?;
Expand Down Expand Up @@ -822,17 +839,28 @@ mod tests {
c.remove_file(deleted_files[0])?;
c.remove_file(deleted_files[1])?;

let (pristine_etc_files, current_etc_files, _) = traverse_etc(&p, &c, Some(&n))?;
let res = compute_diff(&pristine_etc_files, &current_etc_files)?;
let (pristine_etc_files, current_etc_files, new_etc_files) =
traverse_etc(&p, &c, Some(&n))?;

// Test added files
assert_eq!(res.added.len(), new_files.len());
assert!(res.added.iter().all(|file| {
new_files
.iter()
.find(|x| PathBuf::from(*x) == *file)
.is_some()
}));
let res = compute_diff(
&pristine_etc_files,
&current_etc_files,
new_etc_files.as_ref().unwrap(),
)?;

merge(
&c,
&current_etc_files,
&n,
new_etc_files.as_ref().unwrap(),
&res,
)
.expect("Merge failed");

let added_dirs = ["a", "a/b", "a/b/c"];

// 3 for the files, and 3 for the directories
assert_eq!(res.added.len(), new_files.len() + added_dirs.len());

// Test modified files
let all_modified_files = overwritten_files
Expand Down Expand Up @@ -1008,8 +1036,12 @@ mod tests {

let (pristine_etc_files, current_etc_files, new_etc_files) =
traverse_etc(&p, &c, Some(&n))?;
let diff = compute_diff(&pristine_etc_files, &current_etc_files)?;
merge(&c, &current_etc_files, &n, &new_etc_files.unwrap(), diff)?;
let diff = compute_diff(
&pristine_etc_files,
&current_etc_files,
&new_etc_files.as_ref().unwrap(),
)?;
merge(&c, &current_etc_files, &n, &new_etc_files.unwrap(), &diff)?;

assert!(files_eq(&c, &n, "new_file.txt")?);
assert!(files_eq(&c, &n, "a/new_file.txt")?);
Expand Down Expand Up @@ -1081,9 +1113,13 @@ mod tests {

let (pristine_etc_files, current_etc_files, new_etc_files) =
traverse_etc(&p, &c, Some(&n))?;
let diff = compute_diff(&pristine_etc_files, &current_etc_files)?;
let diff = compute_diff(
&pristine_etc_files,
&current_etc_files,
&new_etc_files.as_ref().unwrap(),
)?;

let merge_res = merge(&c, &current_etc_files, &n, &new_etc_files.unwrap(), diff);
let merge_res = merge(&c, &current_etc_files, &n, &new_etc_files.unwrap(), &diff);

assert!(merge_res.is_err());
assert_eq!(
Expand Down
10 changes: 6 additions & 4 deletions crates/lib/src/bootc_composefs/finalize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use bootc_initramfs_setup::mount_composefs_image;
use bootc_mount::tempmount::TempMount;
use cap_std_ext::cap_std::{ambient_authority, fs::Dir};
use cap_std_ext::dirext::CapStdExtDirExt;
use composefs::generic_tree::Directory;
use etc_merge::{compute_diff, merge, print_diff, traverse_etc};
use rustix::fs::{fsync, renameat};
use rustix::path::Arg;
Expand All @@ -32,7 +33,7 @@ pub(crate) async fn get_etc_diff(storage: &Storage, booted_cfs: &BootedComposefs
let current_etc = Dir::open_ambient_dir("/etc", ambient_authority())?;

let (pristine_files, current_files, _) = traverse_etc(&pristine_etc, &current_etc, None)?;
let diff = compute_diff(&pristine_files, &current_files)?;
let diff = compute_diff(&pristine_files, &current_files, &Directory::default())?;

print_diff(&diff, &mut std::io::stdout());

Expand Down Expand Up @@ -76,10 +77,11 @@ pub(crate) async fn composefs_backend_finalize(
let (pristine_files, current_files, new_files) =
traverse_etc(&pristine_etc, &current_etc, Some(&new_etc))?;

let new_files = new_files.ok_or(anyhow::anyhow!("Failed to get dirtree for new etc"))?;
let new_files =
new_files.ok_or_else(|| anyhow::anyhow!("Failed to get dirtree for new etc"))?;

let diff = compute_diff(&pristine_files, &current_files)?;
merge(&current_etc, &current_files, &new_etc, &new_files, diff)?;
let diff = compute_diff(&pristine_files, &current_files, &new_files)?;
merge(&current_etc, &current_files, &new_etc, &new_files, &diff)?;

// Unmount EROFS
drop(erofs_tmp_mnt);
Expand Down
10 changes: 6 additions & 4 deletions crates/lib/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,13 +1823,15 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
let (p, c, n) =
etc_merge::traverse_etc(&pristine_etc, &current_etc, Some(&new_etc))?;

let diff = compute_diff(&p, &c)?;
let n = n
.as_ref()
.ok_or_else(|| anyhow::anyhow!("Failed to get new directory tree"))?;

let diff = compute_diff(&p, &c, &n)?;
print_diff(&diff, &mut std::io::stdout());

if merge {
let n =
n.ok_or_else(|| anyhow::anyhow!("Failed to get dirtree for new etc"))?;
etc_merge::merge(&current_etc, &c, &new_etc, &n, diff)?;
etc_merge::merge(&current_etc, &c, &new_etc, &n, &diff)?;
}

Ok(())
Expand Down
Loading