Fix sector alignment bug in formatting

This commit is contained in:
Reynir Björnsson 2024-10-10 10:31:58 +02:00
parent 02f6c1fe09
commit 6aa490f607

View file

@ -175,15 +175,23 @@ module Make(BLOCK : Mirage_block.S) = struct
write block 0L [ buf ] write block 0L [ buf ]
in in
(* Format the file systems by writing zeroes *) (* Format the file systems by writing zeroes *)
let zeroes = Cstruct.create (max (2 * Tar.Header.length) sector_size) in (* For tar we need to zero (at least) the first 2*512 bytes so we round up
to the nearest sector alignment *)
let zeroes =
let sectors =
(2 * Tar.Header.length + sector_size - 1) / sector_size * sector_size
in
Cstruct.create sectors in
let*? () = let*? () =
write block tar.starting_lba [ Cstruct.sub zeroes 0 (2 * Tar.Header.length) ] write block tar.starting_lba [ zeroes ]
in
(* For the OneFFS filesystems we just need to zero out the first sector *)
let zero_sector = Cstruct.create sector_size in
let*? () =
write block git_dump.starting_lba [ zero_sector ]
in in
let*? () = let*? () =
write block git_dump.starting_lba [ Cstruct.sub zeroes 0 sector_size ] write block md5s.starting_lba [ zero_sector ]
in in
let*? () = write block sha512s.starting_lba [ zero_sector ]
write block md5s.starting_lba [ Cstruct.sub zeroes 0 sector_size ]
in
write block sha512s.starting_lba [ Cstruct.sub zeroes 0 sector_size ]
end end