X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d1481392271fd44b04c384a3dd56f3386edadfb3..e79dc57ebe8d1818fac798d90567915cc4609a13:/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c diff --git a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c index 3113157..ac9920f 100644 --- a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c +++ b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c @@ -495,6 +495,7 @@ static int VentoyProcSecureBoot(int SecureBoot) fl_remove("/EFI/BOOT/grubx64.efi"); fl_remove("/EFI/BOOT/grubx64_real.efi"); fl_remove("/EFI/BOOT/MokManager.efi"); + fl_remove("/EFI/BOOT/mmx64.efi"); fl_remove("/ENROLL_THIS_KEY_IN_MOKMANAGER.cer"); file = fl_fopen("/EFI/BOOT/BOOTX64.EFI", "wb"); @@ -685,6 +686,7 @@ static int ventoy_write_gpt_part_table(int fd, uint64_t disksize, VTOY_GPT_INFO static void * ventoy_update_thread(void *data) { int fd; + int updateMBR; ssize_t len; off_t offset; MBR_HEAD MBR; @@ -742,17 +744,32 @@ static void * ventoy_update_thread(void *data) len = write(fd, disk->vtoydata.rsvdata, sizeof(disk->vtoydata.rsvdata)); vlog("Writing reserve data offset:%llu len:%llu ...\n", (_ull)offset, (_ull)len); + updateMBR = 0; memcpy(&MBR, &(disk->vtoydata.gptinfo.MBR), 512); + if (disk->vtoydata.partition_style == 0 && MBR.PartTbl[0].Active == 0) { MBR.PartTbl[0].Active = 0x80; MBR.PartTbl[1].Active = 0; MBR.PartTbl[2].Active = 0; MBR.PartTbl[3].Active = 0; - + updateMBR = 1; + vlog("set MBR partition 1 active flag enabled\n"); + } + + if (MBR.BootCode[0x190] != 0x56 || MBR.BootCode[0x191] != 0x54) + { + vlog("set VT data %02x %02x\n", MBR.BootCode[0x190], MBR.BootCode[0x191]); + MBR.BootCode[0x190] = 0x56; + MBR.BootCode[0x191] = 0x54; + updateMBR = 1; + } + + if (updateMBR) + { offset = lseek(fd, 0, SEEK_SET); len = write(fd, &MBR, 512); - vlog("set MBR partition 1 active flag enabled offset:%llu len:%llu\n", (_ull)offset, (_ull)len); + vlog("update MBR offset:%llu len:%llu\n", (_ull)offset, (_ull)len); } g_current_progress = PT_SYNC_DATA1;