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

limine-deploy: Fix bug where any_active is not properly set

Browse Source
This commit is contained in:
mintsuki 2022-05-28 04:58:00 +02:00
parent a1d4b6ddb2
commit de1d876d8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
limine-install/limine-install.c
View File

@ -424,7 +424,6 @@ int main(int argc, char *argv[]) {
device_read(&hint8, 446, sizeof(uint8_t)); device_read(&hint8, 446, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) { if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) { if (!force_mbr) {
mbr = 0; mbr = 0;
} else { } else {
@ -432,9 +431,9 @@ int main(int argc, char *argv[]) {
device_write(&hint8, 446, sizeof(uint8_t)); device_write(&hint8, 446, sizeof(uint8_t));
} }
} }
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 462, sizeof(uint8_t)); device_read(&hint8, 462, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) { if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) { if (!force_mbr) {
mbr = 0; mbr = 0;
} else { } else {
@ -442,9 +441,9 @@ int main(int argc, char *argv[]) {
device_write(&hint8, 462, sizeof(uint8_t)); device_write(&hint8, 462, sizeof(uint8_t));
} }
} }
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 478, sizeof(uint8_t)); device_read(&hint8, 478, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) { if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) { if (!force_mbr) {
mbr = 0; mbr = 0;
} else { } else {
@ -452,9 +451,9 @@ int main(int argc, char *argv[]) {
device_write(&hint8, 478, sizeof(uint8_t)); device_write(&hint8, 478, sizeof(uint8_t));
} }
} }
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
device_read(&hint8, 494, sizeof(uint8_t)); device_read(&hint8, 494, sizeof(uint8_t));
if (hint8 != 0x00 && hint8 != 0x80) { if (hint8 != 0x00 && hint8 != 0x80) {
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
if (!force_mbr) { if (!force_mbr) {
mbr = 0; mbr = 0;
} else { } else {
@ -462,6 +461,7 @@ int main(int argc, char *argv[]) {
device_write(&hint8, 494, sizeof(uint8_t)); device_write(&hint8, 494, sizeof(uint8_t));
} }
} }
any_active = any_active ? any_active : (hint8 & 0x80) != 0;
char hintc[64]; char hintc[64];
device_read(hintc, 4, 8); device_read(hintc, 4, 8);