Fix a bug when install Ventoy if the USB already mounted at a path that contains...

[Ventoy.git] / LinuxGUI / Ventoy2Disk / Web / ventoy_http.c

diff --git a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
index 77fcebffd12d8073bddb7da9c2409c6de965b750..8344b05d8577da418350ff031aedb9d7e2819422 100644 (file)
--- a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
+++ b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <linux/fs.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <linux/fs.h>

+#include <linux/limits.h>

 #include <dirent.h>
 #include <pthread.h>
 #include <ventoy_define.h>
 #include <dirent.h>
 #include <pthread.h>
 #include <ventoy_define.h>


@@ -160,9 +161,10 @@ static int ventoy_http_save_cfg(void)
 {
     FILE *fp;
 
 {
     FILE *fp;
 

-    fp = fopen("./Ventoy2Disk.ini", "w");
+    fp = fopen(g_ini_file, "w");

     if (!fp)
     {
     if (!fp)
     {

+        vlog("Failed to open %s code:%d\n", g_ini_file, errno);

         return 0;
     }
 
         return 0;
     }
 


@@ -180,7 +182,7 @@ static int ventoy_http_load_cfg(void)
     char line[256];
     FILE *fp;
 
     char line[256];
     FILE *fp;
 

-    fp = fopen("./Ventoy2Disk.ini", "r");
+    fp = fopen(g_ini_file, "r");

     if (!fp)
     {
         return 0;
     if (!fp)
     {
         return 0;


@@ -683,6 +685,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;
 static void * ventoy_update_thread(void *data)
 {
     int fd;

+    int updateMBR;

     ssize_t len;
     off_t offset;
     MBR_HEAD MBR;
     ssize_t len;
     off_t offset;
     MBR_HEAD MBR;


@@ -740,17 +743,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);
 
     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);
     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;
     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);
         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;
     }
     
     g_current_progress = PT_SYNC_DATA1;


@@ -1499,7 +1517,7 @@ int ventoy_http_start(const char *ip, const char *port)
     {
            "listening_ports",    "24680",
         "document_root",      "WebUI",
     {
            "listening_ports",    "24680",
         "document_root",      "WebUI",

-        "error_log_file",     VTOY_LOG_FILE,
+        "error_log_file",     g_log_file,

            "request_timeout_ms", "10000",
             NULL
     };
            "request_timeout_ms", "10000",
             NULL
     };