Add an additional MB of space to the generated FAT partition#397
Add an additional MB of space to the generated FAT partition#397phil-opp merged 1 commit intorust-osdev:mainfrom
Conversation
src/fat.rs
Outdated
| .open(out_fat_path) | ||
| .unwrap(); | ||
| let fat_size_padded_and_rounded = ((needed_size + 1024 * 64 - 1) / MB + 1) * MB; | ||
| let fat_size_padded_and_rounded = ((needed_size + 1024 * 64 - 1) / MB + MB) * MB; |
There was a problem hiding this comment.
Is that increasing the size by a terabyte? Note that the expression in the parentheses is already multiplied by MB, so now it ends up being (... + MB) * MB, which should be a TB if I'm not mistaken. Replacing the 1 by a 2 is probably a more storage efficient fix 😀
There was a problem hiding this comment.
Alright, doing something else then, hold on…
There was a problem hiding this comment.
Alright, I decided to revert it back to what it was before and instead simply append + MB to the end of that long calculation, since adding a megabyte is far more reasonable than multiplying.
There was a problem hiding this comment.
Finally got this down to one commit but it took git reset --hard <the first of my previous commits> and git pull https://github.com/rust-osdev/bootloader main --allow-unrelated-histories --rebase to do it.
Add MB instead of multiplying
|
Could you remove the first commit? |
|
A revert commit is still a commit, ideally we'd only have a single commit for this pr. See https://stackoverflow.com/a/42522493 on how to remove commits without creating a revert commits. |
Add MB instead of multiplying
kennystrawnmusic
force-pushed
the
patch-2
branch
3 times, most recently
from
7297d1c to
16624cd
Compare
phil-opp
changed the title
phil-opp
left a comment
phil-opp
left a comment
There was a problem hiding this comment.
Looks good, thanks!
I updated the PR title to be more descriptive and added the line Fixes #396 to the PR description to automatically close the issue after merging.
One minor request: Right now the title of your commit is "Hard reset per @Freax13's request", which is not really useful. Could you change it to something more descriptive? An easy way to do this is to run the following command:
git commit --amend --message "Add an additional MB of space to the generated FAT partition"
src/fat.rs
Outdated
| .open(out_fat_path) | ||
| .unwrap(); | ||
| let fat_size_padded_and_rounded = ((needed_size + 1024 * 64 - 1) / MB + 1) * MB; | ||
| let fat_size_padded_and_rounded = (((needed_size + 1024 * 64 - 1) / MB + 1) * MB) + MB; |
There was a problem hiding this comment.
To me it's more readable without the extra parentheses:
| let fat_size_padded_and_rounded = (((needed_size + 1024 * 64 - 1) / MB + 1) * MB) + MB; | |
| let fat_size_padded_and_rounded = ((needed_size + 1024 * 64 - 1) / MB + 1) * MB + MB; |
There was a problem hiding this comment.
Had to use a hard reset and force-push to incorporate both of these changes without also inadvertently turning 1 commit into 2, but done.
kennystrawnmusic
force-pushed
the
patch-2
branch
from
16624cd to
244ec1a
Compare
kennystrawnmusic
force-pushed
the
patch-2
branch
from
244ec1a to
52c8338
Compare
|
By the way, I recommend to use |
3 participants
Increasing the image size by an additional megabyte makes the image compile again
Fixes #396