Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

limine-deploy: Do not mark any protective MBR partition as active

This commit is contained in:
mintsuki 2022-04-15 19:46:50 +02:00
parent d8180342f0
commit e5f2b2c085
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
limine-deploy/limine-deploy.c
View File

@ -428,8 +428,11 @@ int main(int argc, char *argv[]) {
}
}
bool any_active = false;
device_read(&hint8, 446, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) {
mbr = 0;
} else {
@ -439,6 +442,7 @@ int main(int argc, char *argv[]) {
}
device_read(&hint8, 462, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) {
mbr = 0;
} else {
@ -448,6 +452,7 @@ int main(int argc, char *argv[]) {
}
device_read(&hint8, 478, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) {
mbr = 0;
} else {
@ -457,6 +462,7 @@ int main(int argc, char *argv[]) {
}
device_read(&hint8, 494, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) {
mbr = 0;
} else {
@ -465,6 +471,13 @@ int main(int argc, char *argv[]) {
}
}
if (!any_active) {
fprintf(stderr, "No active partition found, some systems may not boot.\n");
fprintf(stderr, "Setting partition 1 as active to work around the issue...\n");
hint8 = 0x80;
device_write(&hint8, 446, sizeof(uint8_t));
}
char hintc[64];
device_read(hintc, 4, 8);
if (memcmp(hintc, "_ECH_FS_", 8) == 0) {
@ -506,25 +519,6 @@ int main(int argc, char *argv[]) {
goto cleanup;
}
bool any_active = false;
uint8_t hint8;
device_read(&hint8, 446, sizeof(uint8_t));
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 462, sizeof(uint8_t));
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 478, sizeof(uint8_t));
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 494, sizeof(uint8_t));
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!any_active) {
fprintf(stderr, "No active MBR partition found, some systems may not boot.\n");
fprintf(stderr, "Setting partition 1 as active to work around the issue...\n");
hint8 = 0x80;
device_write(&hint8, 446, sizeof(uint8_t));
}
size_t stage2_size = bootloader_file_size - 512;
size_t stage2_sects = DIV_ROUNDUP(stage2_size, 512);