containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 15:45:53 +01:00
Code Issues Activity

composefs/upgrade: Remove existing staged entries

Browse Source 
When upgrading, switching if there is already a staged directory for
bootloader entries, then delete it as we would overwrite it anyway

Fixes: https://github.com/bootc-dev/bootc/issues/1857

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
This commit is contained in:
Pragyan Poudyal
2025-12-17 12:51:45 +05:30
committed by Pragyan Poudyal
parent d8ce93120f
commit fa1726b161
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/lib/src/bootc_composefs/boot.rs
View File

@@ -730,11 +730,19 @@ pub(crate) fn setup_composefs_bls_boot(
let mut booted_bls = get_booted_bls(&boot_dir)?;
booted_bls.sort_key = Some(secondary_sort_key(&os_id));
let staged_path = loader_path.join(STAGED_BOOT_LOADER_ENTRIES);
// Delete the staged entries directory if it exists as we want to overwrite the entries
// anyway
if boot_dir
.remove_all_optional(TYPE1_ENT_PATH_STAGED)
.context("Failed to remove staged directory")?
{
tracing::debug!("Removed existing staged entries directory");
}
// This will be atomically renamed to 'loader/entries' on shutdown/reboot
(
loader_path.join(STAGED_BOOT_LOADER_ENTRIES),
Some(booted_bls),
)
(staged_path, Some(booted_bls))
} else {
(loader_path.join(BOOT_LOADER_ENTRIES), None)
};