Fix the issue introduced in LinuxGUI version. (#3128)

diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
index fa2af33a9c0aa014d77927dcc70fdf8adaad6862..7844b922994a334a3922fb70b9c45ac61acd2fdf 100644 (file)
--- a/INSTALL/tool/VentoyWorker.sh
+++ b/INSTALL/tool/VentoyWorker.sh
@@ -625,10 +625,14 @@ else
         check_umount_disk "$DISK"
         vtoycli partresize -s $DISK $part2_start
     fi
         check_umount_disk "$DISK"
         vtoycli partresize -s $DISK $part2_start
     fi

+

     
     

-    vtinfo "update esp partition attribute"
-    vtoycli gpt -f $DISK
-    sync
+    if [ "$PART1_TYPE" = "EE" ]; then    
+        vtinfo "update esp partition attribute"
+        vtoycli gpt -f $DISK
+        sync
+    fi
+

 
     echo ""
     vtinfo "Update Ventoy on $DISK successfully finished."
 
     echo ""
     vtinfo "Update Ventoy on $DISK successfully finished."

diff --git a/INSTALL/tool/aarch64/V2DServer b/INSTALL/tool/aarch64/V2DServer
index 64fbbbc4ef05673a75f22997237f6a9b0211eb04..a35bd7d138af3e712c0cc7d5ccefd74180b05aeb 100644 (file)
Binary files a/INSTALL/tool/aarch64/V2DServer and b/INSTALL/tool/aarch64/V2DServer differ

diff --git a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3
index 65f84ec2c83e65ab05e13e3a3d4ac5ddf5503c37..e0203a8155d0c9344ca7c2a9e2ee32da96e66357 100644 (file)
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 and b/INSTALL/tool/aarch64/Ventoy2Disk.gtk3 differ

diff --git a/INSTALL/tool/aarch64/Ventoy2Disk.qt5 b/INSTALL/tool/aarch64/Ventoy2Disk.qt5
index cc7630aea537c25e300fd58819e58d5a966c3d1b..4a3f5fb948d73da76d50c3130d00038ec23a55a0 100644 (file)
Binary files a/INSTALL/tool/aarch64/Ventoy2Disk.qt5 and b/INSTALL/tool/aarch64/Ventoy2Disk.qt5 differ

diff --git a/INSTALL/tool/aarch64/vtoycli b/INSTALL/tool/aarch64/vtoycli
index 0ce9c93a573400a9823de7e5ec5fba3015b9ebc9..7186ceb7985a30dbf19c699a8bb8adb2a54b4291 100644 (file)
Binary files a/INSTALL/tool/aarch64/vtoycli and b/INSTALL/tool/aarch64/vtoycli differ

diff --git a/INSTALL/tool/i386/V2DServer b/INSTALL/tool/i386/V2DServer
index 1f809e74bec51c82e45cb15061524333c5f79b45..f394355a807d3a1f802c1c91671bb39568b5c1d4 100644 (file)
Binary files a/INSTALL/tool/i386/V2DServer and b/INSTALL/tool/i386/V2DServer differ

diff --git a/INSTALL/tool/i386/Ventoy2Disk.gtk2 b/INSTALL/tool/i386/Ventoy2Disk.gtk2
index 697631b9ee00d906065e98a52584e8972ce6c2d2..32fb51044cbac4be40af4a58194f680d28ab86a8 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk2 and b/INSTALL/tool/i386/Ventoy2Disk.gtk2 differ

diff --git a/INSTALL/tool/i386/Ventoy2Disk.gtk3 b/INSTALL/tool/i386/Ventoy2Disk.gtk3
index 7dc3ad7cae20ad071a1ff623bbbf3583642495c7..a2ed83009f41d811dfc1b022435b2cdac3050e33 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.gtk3 and b/INSTALL/tool/i386/Ventoy2Disk.gtk3 differ

diff --git a/INSTALL/tool/i386/Ventoy2Disk.qt5 b/INSTALL/tool/i386/Ventoy2Disk.qt5
index 3ba83071375b4f9ee0b76d5960d1638c412e3d75..2f5efb3650adc075b6311dd16525042f4efb4928 100644 (file)
Binary files a/INSTALL/tool/i386/Ventoy2Disk.qt5 and b/INSTALL/tool/i386/Ventoy2Disk.qt5 differ

diff --git a/INSTALL/tool/i386/vtoycli b/INSTALL/tool/i386/vtoycli
index cbe2d989a3df8bb0c1ce86b0439a362e7554142f..02eae99e1558f6cfa19291f0fb8b43bf28c4f95f 100644 (file)
Binary files a/INSTALL/tool/i386/vtoycli and b/INSTALL/tool/i386/vtoycli differ

diff --git a/INSTALL/tool/mips64el/V2DServer b/INSTALL/tool/mips64el/V2DServer
index b4d9fe664168a1fed8f2c7464b15bb281c433362..8ea50cb001bdb86ec8621fa212adf570bda1c72d 100644 (file)
Binary files a/INSTALL/tool/mips64el/V2DServer and b/INSTALL/tool/mips64el/V2DServer differ

diff --git a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3
index e53bb8b7328dbc93f103ffd1aa08f2308e15685b..60d7cb94f93eb3b0f40bf1effda31258ba647dd7 100644 (file)
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 and b/INSTALL/tool/mips64el/Ventoy2Disk.gtk3 differ

diff --git a/INSTALL/tool/mips64el/Ventoy2Disk.qt5 b/INSTALL/tool/mips64el/Ventoy2Disk.qt5
index e919b933a7b2a861519479966a0c21c478eb35d7..903c3e0e479a8bd2bf44cc9e3989ad70d950fab7 100644 (file)
Binary files a/INSTALL/tool/mips64el/Ventoy2Disk.qt5 and b/INSTALL/tool/mips64el/Ventoy2Disk.qt5 differ

diff --git a/INSTALL/tool/mips64el/vtoycli b/INSTALL/tool/mips64el/vtoycli
index 4a0e20b10c181ec8b20373c3155e9b659b5047e4..18ecd6a4427e57283cba705b4cde1fb90fd90978 100644 (file)
Binary files a/INSTALL/tool/mips64el/vtoycli and b/INSTALL/tool/mips64el/vtoycli differ

diff --git a/INSTALL/tool/x86_64/V2DServer b/INSTALL/tool/x86_64/V2DServer
index bb1235f64469cd96c3f0a036e8ec7ef819c9af92..aff2c386bec015ff5fa55c09b3ea5ed2db177077 100644 (file)
Binary files a/INSTALL/tool/x86_64/V2DServer and b/INSTALL/tool/x86_64/V2DServer differ

diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2
index 4eea1035f6dc614c603ed6258e4ff3b1e682fa0e..b9aa5137e300ec5382759895c3bcc4e90bd17bfc 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk2 differ

diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3
index 8e691928cb580469220729e6ea8b14d1480ba5a7..27c2260861667dd965529d5dc9a2ed6eaf279aa5 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 and b/INSTALL/tool/x86_64/Ventoy2Disk.gtk3 differ

diff --git a/INSTALL/tool/x86_64/Ventoy2Disk.qt5 b/INSTALL/tool/x86_64/Ventoy2Disk.qt5
index e87fe82c4deff9fbcbe3aa85338368f1a32165f2..82dd6e06bf8d054ec0622509e0a2175deaecf9b9 100644 (file)
Binary files a/INSTALL/tool/x86_64/Ventoy2Disk.qt5 and b/INSTALL/tool/x86_64/Ventoy2Disk.qt5 differ

diff --git a/INSTALL/tool/x86_64/vtoycli b/INSTALL/tool/x86_64/vtoycli
index ab36a28239bd6f169bd71623050c919e553fb8c8..1e5c1b3ad64ae4c47607869cafea16e0bd282e1d 100644 (file)
Binary files a/INSTALL/tool/x86_64/vtoycli and b/INSTALL/tool/x86_64/vtoycli differ

diff --git a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
index ec0c3ca908cae8e62a2fc78dcc278c1e04970789..88f0e953f1468aaa216a889414c797d6d74fa381 100644 (file)
--- a/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
+++ b/LinuxGUI/Ventoy2Disk/Web/ventoy_http.c
@@ -807,6 +807,8 @@ static void * ventoy_update_thread(void *data)
                  pstGPT->PartTbl[1].Attr, 0x8000000000000000ULL);
 
             pstGPT->PartTbl[1].Attr = 0x8000000000000000ULL;
                  pstGPT->PartTbl[1].Attr, 0x8000000000000000ULL);
 
             pstGPT->PartTbl[1].Attr = 0x8000000000000000ULL;

+
+            pstGPT->Head.PartTblCrc = ventoy_crc32(pstGPT->PartTbl, sizeof(pstGPT->PartTbl));

             pstGPT->Head.Crc = 0;
             pstGPT->Head.Crc = ventoy_crc32(&(pstGPT->Head), pstGPT->Head.Length);            
             ventoy_write_gpt_part_table(fd, disk->size_in_byte, pstGPT);
             pstGPT->Head.Crc = 0;
             pstGPT->Head.Crc = ventoy_crc32(&(pstGPT->Head), pstGPT->Head.Length);            
             ventoy_write_gpt_part_table(fd, disk->size_in_byte, pstGPT);

diff --git a/vtoycli/vtoygpt.c b/vtoycli/vtoygpt.c
index 1d9d262161baff2ef207afb85b7f1454eaf7e2c2..f0e2e62a74fc2e09e6eb72cc64972a54ef67bfb3 100644 (file)
--- a/vtoycli/vtoygpt.c
+++ b/vtoycli/vtoygpt.c
@@ -191,23 +191,26 @@ int vtoygpt_main(int argc, char **argv)
         Name = pMainGptInfo->PartTbl[1].Name;
         if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
         {
         Name = pMainGptInfo->PartTbl[1].Name;
         if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
         {

-            pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
-            pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
-            pMainGptInfo->Head.Crc = 0;
-            pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);
-
-            pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
-            pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
-            pBackGptInfo->Head.Crc = 0;
-            pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);
-
-            lseek(fd, 512, SEEK_SET);
-            write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);
-
-            lseek(fd, DiskSize - 33 * 512, SEEK_SET);
-            write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));
-
-            fsync(fd);
+            if (pMainGptInfo->PartTbl[1].Attr != VENTOY_EFI_PART_ATTR)
+            {                
+                pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
+                pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
+                pMainGptInfo->Head.Crc = 0;
+                pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);
+
+                pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
+                pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
+                pBackGptInfo->Head.Crc = 0;
+                pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);
+
+                lseek(fd, 512, SEEK_SET);
+                write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);
+
+                lseek(fd, DiskSize - 33 * 512, SEEK_SET);
+                write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));
+
+                fsync(fd);
+            }

         }
     }
 
         }
     }
 

diff --git a/vtoygpt/vtoygpt.c b/vtoygpt/vtoygpt.c
index cfd99fd59888a2e5216d2d0497b203de0b775659..97e4f0f84578dbe13d7bbc2ea71ed4ad5b5ab0a4 100644 (file)
--- a/vtoygpt/vtoygpt.c
+++ b/vtoygpt/vtoygpt.c
@@ -291,23 +291,26 @@ int main(int argc, const char **argv)
         Name = pMainGptInfo->PartTbl[1].Name;
         if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
         {
         Name = pMainGptInfo->PartTbl[1].Name;
         if (Name[0] == 'V' && Name[1] == 'T' && Name[2] == 'O' && Name[3] == 'Y')
         {

-            pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
-            pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
-            pMainGptInfo->Head.Crc = 0;
-            pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);
-
-            pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
-            pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
-            pBackGptInfo->Head.Crc = 0;
-            pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);
-
-            lseek(fd, 512, SEEK_SET);
-            write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);
-
-            lseek(fd, DiskSize - 33 * 512, SEEK_SET);
-            write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));
-
-            fsync(fd);
+            if (pMainGptInfo->PartTbl[1].Attr != VENTOY_EFI_PART_ATTR)
+            {                
+                pMainGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
+                pMainGptInfo->Head.PartTblCrc = VtoyCrc32(pMainGptInfo->PartTbl, sizeof(pMainGptInfo->PartTbl));
+                pMainGptInfo->Head.Crc = 0;
+                pMainGptInfo->Head.Crc = VtoyCrc32(&pMainGptInfo->Head, pMainGptInfo->Head.Length);
+
+                pBackGptInfo->PartTbl[1].Attr = VENTOY_EFI_PART_ATTR;
+                pBackGptInfo->Head.PartTblCrc = VtoyCrc32(pBackGptInfo->PartTbl, sizeof(pBackGptInfo->PartTbl));
+                pBackGptInfo->Head.Crc = 0;
+                pBackGptInfo->Head.Crc = VtoyCrc32(&pBackGptInfo->Head, pBackGptInfo->Head.Length);
+
+                lseek(fd, 512, SEEK_SET);
+                write(fd, (UINT8 *)pMainGptInfo + 512, sizeof(VTOY_GPT_INFO) - 512);
+
+                lseek(fd, DiskSize - 33 * 512, SEEK_SET);
+                write(fd, pBackGptInfo, sizeof(VTOY_BK_GPT_INFO));
+
+                fsync(fd);
+            }

         }
     }
 
         }
     }