1.0.36 release

sorphin · Feb 27, 2021 · cbbd57e · cbbd57e
1 parent 7b08954
commit cbbd57e
Show file tree

Hide file tree

Showing 58 changed files with 136 additions and 1,042 deletions.
diff --git a/INSTALL/README b/INSTALL/README
@@ -18,9 +18,8 @@ Please refer https://www.ventoy.net/en/doc_start.html for details.
 
 
 ========== VentoyWeb.sh ===============
-sudo sh VentoyWeb.sh 
-Normally, it will popup a web browser window. 
-If not you can open your browser and visit http://127.0.0.1:24680
+1. sudo sh VentoyWeb.sh 
+2. open your browser and visit http://127.0.0.1:24680
 
 
 

diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe
diff --git a/INSTALL/VentoyWeb.sh b/INSTALL/VentoyWeb.sh
@@ -97,6 +97,11 @@ if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
     chmod +x ./tool/$TOOLDIR/V2DServer
 fi
 
+
+V2DServer "$HOST" "$PORT" &
+wID=$!
+sleep 1
+
 vtVer=$(cat ventoy/version)
 echo ""
 echo "==============================================================="
@@ -112,7 +117,7 @@ echo ""
 echo "################## Press Ctrl + C to exit #####################"
 echo ""
 
-V2DServer "$HOST" "$PORT"
+wait $wID
 
 if [ -n "$OLDDIR" ]; then 
     CURDIR=$(pwd)

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
@@ -1546,7 +1546,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.35"
+set VENTOY_VERSION="1.0.36"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
@@ -125,11 +125,7 @@ if [ "$MODE" = "list" ]; then
 fi
 
 #check mountpoint
-grep "^$DISK" /proc/mounts | while read mtline; do
-    mtpnt=$(echo $mtline | awk '{print $2}')
-    vtdebug "Trying to umount $mtpnt ..."
-    umount $mtpnt >/dev/null 2>&1
-done
+check_umount_disk "$DISK"
 
 if grep "$DISK" /proc/mounts; then
     vterr "$DISK is already mounted, please umount it first!"
@@ -299,6 +295,9 @@ if [ "$MODE" = "install" ]; then
         xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1
     fi
 
+    # check and umount
+    check_umount_disk "$DISK"
+
     xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start_sector
 
     #test UUID
@@ -317,10 +316,7 @@ if [ "$MODE" = "install" ]; then
     vtinfo "esp partition processing ..."
 
     sleep 1
-    mtpnt=$(grep "^${PART2}" /proc/mounts | awk '{print $2}')
-    if [ -n "$mtpnt" ]; then
-        umount $mtpnt >/dev/null 2>&1
-    fi
+    check_umount_disk "$DISK"    
 
     if [ "$SECUREBOOT" != "YES" ]; then        
         mkdir ./tmp_mnt
@@ -332,10 +328,7 @@ if [ "$MODE" = "install" ]; then
                 break
             fi
 
-            mtpnt=$(grep "^${PART2}" /proc/mounts | awk '{print $2}')
-            if [ -n "$mtpnt" ]; then
-                umount $mtpnt >/dev/null 2>&1
-            fi    
+            check_umount_disk "$DISK"            
             sleep 2
         done
 
@@ -349,6 +342,8 @@ if [ "$MODE" = "install" ]; then
         mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi  ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi  ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
 
+        sync
+
         for tt in 1 2 3; do
             if umount ./tmp_mnt; then
                 vtdebug "umount part2 success"
@@ -439,15 +434,19 @@ else
     dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
     rm -f ./rsvdata.bin
 
+    check_umount_disk "$DISK"
+
     xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start
 
     sync
-    
+
     if [ "$SECUREBOOT" != "YES" ]; then
         mkdir ./tmp_mnt
 
         vtdebug "mounting part2 ...."        
-        for tt in 1 2 3 4 5; do            
+        for tt in 1 2 3 4 5; do
+            check_umount_disk "$DISK"
+
             if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then
                 vtdebug "mounting part2 success"
                 break
@@ -467,6 +466,7 @@ else
         mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi  ./tmp_mnt/EFI/BOOT/BOOTX64.EFI
         mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi  ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI
 
+        sync
 
         for tt in 1 2 3; do
             if umount ./tmp_mnt > /dev/null 2>&1; then

diff --git a/INSTALL/tool/ventoy_lib.sh b/INSTALL/tool/ventoy_lib.sh
@@ -97,6 +97,14 @@ get_disk_part_name() {
     fi
 }
 
+check_umount_disk() {
+    DiskOrPart="$1"
+    grep "^${DiskOrPart}" /proc/mounts | while read mtline; do
+        mtpnt=$(echo $mtline | awk '{print $2}')
+        vtdebug "Trying to umount $mtpnt ..."
+        umount $mtpnt >/dev/null 2>&1
+    done
+}
 
 get_ventoy_version_from_cfg() {
     if grep -q 'set.*VENTOY_VERSION=' $1; then
@@ -218,6 +226,14 @@ format_ventoy_disk_mbr() {
     fi
 
     part2_start_sector=$(expr $part1_end_sector + 1)
+
+    modsector=$(expr $part2_start_sector % 8)
+    if [ $modsector -gt 0 ]; then
+        vtdebug "modsector:$modsector need to be aligned with 4KB"
+        part1_end_sector=$(expr $part1_end_sector - $modsector)
+        part2_start_sector=$(expr $part1_end_sector + 1)
+    fi
+
     part2_end_sector=$(expr $part2_start_sector + $VENTOY_SECTOR_NUM - 1)
 
     export part2_start_sector
@@ -302,6 +318,8 @@ EOF
 
     echo "create efi fat fs $PART2 ..."
     for i in 0 1 2 3 4 5 6 7 8 9; do
+        check_umount_disk "$PART2"
+
         if mkfs.vfat -F 16 -n VTOYEFI $PART2; then
             echo 'success'
             break
@@ -333,6 +351,14 @@ format_ventoy_disk_gpt() {
     fi
 
     part2_start_sector=$(expr $part1_end_sector + 1)
+
+    modsector=$(expr $part2_start_sector % 8)
+    if [ $modsector -gt 0 ]; then
+        vtdebug "modsector:$modsector need to be aligned with 4KB"
+        part1_end_sector=$(expr $part1_end_sector - $modsector)
+        part2_start_sector=$(expr $part1_end_sector + 1)
+    fi
+
     part2_end_sector=$(expr $part2_start_sector + $VENTOY_SECTOR_NUM - 1)
 
     export part2_start_sector
@@ -397,7 +423,10 @@ format_ventoy_disk_gpt() {
     fi
 
     echo "create efi fat fs $PART2 ..."
+
     for i in 0 1 2 3 4 5 6 7 8 9; do
+        check_umount_disk "$PART2"
+
         if mkfs.vfat -F 16 -n VTOYEFI $PART2; then
             echo 'success'
             break

diff --git a/LinuxGUI/Ventoy2Disk/Core/ventoy_disk.c b/LinuxGUI/Ventoy2Disk/Core/ventoy_disk.c
@@ -330,6 +330,7 @@ static int fatlib_is_secure_boot_enable(void)
     flfile = fl_fopen("/EFI/BOOT/grubx64_real.efi", "rb");
     if (flfile)
     {
+        vlog("/EFI/BOOT/grubx64_real.efi find, secure boot in enabled\n");
         fl_fclose(flfile);
         return 1;
     }
@@ -504,7 +505,10 @@ int ventoy_get_vtoy_data(ventoy_disk *info, int *ppartstyle)
         goto end;
     }
 
-    vdebug("now check secure boot ...\n");
+    vdebug("ventoy partition layout check OK: [%llu %llu] [%llu %llu]\n", 
+               part1_start_sector, part1_sector_count, part2_start_sector, part2_sector_count);
+
+    vdebug("now check secure boot for %s ...\n", info->disk_path);
 
     g_fatlib_media_fd = fd;
     g_fatlib_media_offset = part2_start_sector;
@@ -546,7 +550,7 @@ int ventoy_get_vtoy_data(ventoy_disk *info, int *ppartstyle)
 
     rc = 0;
 end:
-    close(fd);
+    vtoy_safe_close_fd(fd);
     return rc;
 }
 

diff --git a/LinuxGUI/Ventoy2Disk/Core/ventoy_log.c b/LinuxGUI/Ventoy2Disk/Core/ventoy_log.c
@@ -80,6 +80,34 @@ void ventoy_syslog_newline(int level, const char *Fmt, ...)
     pthread_mutex_unlock(&g_log_mutex);
 }
 
+void ventoy_syslog_printf(const char *Fmt, ...)
+{
+    char log[512];
+    va_list arg;
+    time_t stamp;
+    struct tm ttm;
+    FILE *fp;
+
+    time(&stamp);
+    localtime_r(&stamp, &ttm);
+
+    va_start(arg, Fmt);
+    vsnprintf(log, 512, Fmt, arg);
+    va_end(arg);
+
+    pthread_mutex_lock(&g_log_mutex);
+    fp = fopen(VTOY_LOG_FILE, "a+");
+    if (fp)
+    {
+        fprintf(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s", 
+           ttm.tm_year, ttm.tm_mon, ttm.tm_mday,
+           ttm.tm_hour, ttm.tm_min, ttm.tm_sec,
+           log);
+        fclose(fp);
+    }
+    pthread_mutex_unlock(&g_log_mutex);
+}
+
 void ventoy_syslog(int level, const char *Fmt, ...)
 {
     char log[512];

diff --git a/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c b/LinuxGUI/Ventoy2Disk/Core/ventoy_util.c
@@ -347,6 +347,7 @@ static int ventoy_fill_gpt_partname(uint16_t Name[36], const char *asciiName)
 int ventoy_fill_gpt(uint64_t size, uint64_t reserve, int align4k, VTOY_GPT_INFO *gpt)
 {
     uint64_t ReservedSector = 33;
+    uint64_t ModSectorCount = 0;
     uint64_t Part1SectorCount = 0;
     uint64_t DiskSectorCount = size / 512;
     VTOY_GPT_HDR *Head = &gpt->Head;
@@ -362,18 +363,28 @@ int ventoy_fill_gpt(uint64_t size, uint64_t reserve, int align4k, VTOY_GPT_INFO
         ReservedSector += reserve / 512;
     }
 
+    Part1SectorCount = DiskSectorCount - ReservedSector - (VTOYEFI_PART_BYTES / 512) - 2048;
+
+    ModSectorCount = (Part1SectorCount % 8);
+    if (ModSectorCount)
+    {
+        vlog("Part1SectorCount:%llu is not aligned by 4KB (%llu)\n", (_ull)Part1SectorCount, (_ull)ModSectorCount);
+    }
+
     // check aligned with 4KB
     if (align4k)
     {
-        if (DiskSectorCount % 8)
+        if (ModSectorCount)
         {
-            vdebug("Disk need to align with 4KB %u\n", (uint32_t)(DiskSectorCount % 8));
-            ReservedSector += (DiskSectorCount % 8);
+            vdebug("Disk need to align with 4KB %u\n", (uint32_t)ModSectorCount);
+            Part1SectorCount -= ModSectorCount;
+        }
+        else
+        {
+            vdebug("no need to align with 4KB\n");
         }
     }
 
-    Part1SectorCount = DiskSectorCount - ReservedSector - (VTOYEFI_PART_BYTES / 512) - 2048;
-
     memcpy(Head->Signature, "EFI PART", 8);
     Head->Version[2] = 0x01;
     Head->Length = 92;
@@ -461,7 +472,7 @@ int VentoyFillMBRLocation(uint64_t DiskSizeInBytes, uint32_t StartSectorId, uint
     return 0;
 }
 
-int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, int PartStyle, MBR_HEAD *pMBR)
+int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, MBR_HEAD *pMBR)
 {
     ventoy_guid Guid;
     uint32_t DiskSignature;
@@ -498,11 +509,6 @@ int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, int PartStyle,
 		ReservedSector = (uint32_t)(reserve / 512);
 	}
 
-    if (PartStyle)
-    {
-        ReservedSector += 33; // backup GPT part table
-    }
-
     // check aligned with 4KB
     if (align4k)
     {
@@ -512,11 +518,14 @@ int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, int PartStyle,
             vlog("Disk need to align with 4KB %u\n", (uint32_t)(sectors % 8));
             ReservedSector += (uint32_t)(sectors % 8);
         }
+        else
+        {
+            vdebug("no need to align with 4KB\n");
+        }
     }
 
 	vlog("ReservedSector: %u\n", ReservedSector);
 
-
     //Part1
     PartStartSector = VTOYIMG_PART_START_SECTOR;
 	PartSectorCount = DiskSectorCount - ReservedSector - VTOYEFI_PART_BYTES / 512 - PartStartSector;

diff --git a/LinuxGUI/Ventoy2Disk/Core/ventoy_util.h b/LinuxGUI/Ventoy2Disk/Core/ventoy_util.h
@@ -46,7 +46,7 @@ int unxz(unsigned char *in, int in_size,
 int ventoy_read_file_to_buf(const char *FileName, int ExtLen, void **Bufer, int *BufLen);
 const char * ventoy_get_local_version(void);
 int ventoy_fill_gpt(uint64_t size, uint64_t reserve, int align4k, VTOY_GPT_INFO *gpt);
-int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, int PartStyle, MBR_HEAD *pMBR);
+int ventoy_fill_mbr(uint64_t size, uint64_t reserve, int align4k, MBR_HEAD *pMBR);
 
 #endif /* __VENTOY_UTIL_H__ */
 
diff --git a/...entoy2Disk/Lib/fat_io_lib/release/API.txt → LinuxGUI/Ventoy2Disk/Lib/fat_io_lib/API.txt b/...entoy2Disk/Lib/fat_io_lib/release/API.txt → LinuxGUI/Ventoy2Disk/Lib/fat_io_lib/API.txt
diff --git a/...Disk/Lib/fat_io_lib/release/COPYRIGHT.txt → .../Ventoy2Disk/Lib/fat_io_lib/COPYRIGHT.txt b/...Disk/Lib/fat_io_lib/release/COPYRIGHT.txt → .../Ventoy2Disk/Lib/fat_io_lib/COPYRIGHT.txt
diff --git a/.../Lib/fat_io_lib/release/Configuration.txt → ...toy2Disk/Lib/fat_io_lib/Configuration.txt b/.../Lib/fat_io_lib/release/Configuration.txt → ...toy2Disk/Lib/fat_io_lib/Configuration.txt
diff --git a/...y2Disk/Lib/fat_io_lib/release/History.txt → ...UI/Ventoy2Disk/Lib/fat_io_lib/History.txt b/...y2Disk/Lib/fat_io_lib/release/History.txt → ...UI/Ventoy2Disk/Lib/fat_io_lib/History.txt
diff --git a/...y2Disk/Lib/fat_io_lib/release/License.txt → ...UI/Ventoy2Disk/Lib/fat_io_lib/License.txt b/...y2Disk/Lib/fat_io_lib/release/License.txt → ...UI/Ventoy2Disk/Lib/fat_io_lib/License.txt
diff --git a/...b/fat_io_lib/release/Media Access API.txt → ...2Disk/Lib/fat_io_lib/Media Access API.txt b/...b/fat_io_lib/release/Media Access API.txt → ...2Disk/Lib/fat_io_lib/Media Access API.txt
diff --git a/LinuxGUI/Ventoy2Disk/Lib/fat_io_lib/buildlib.sh b/LinuxGUI/Ventoy2Disk/Lib/fat_io_lib/buildlib.sh
diff --git a/...2Disk/Lib/fat_io_lib/release/fat_access.c → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_access.c b/...2Disk/Lib/fat_io_lib/release/fat_access.c → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_access.c
diff --git a/...2Disk/Lib/fat_io_lib/include/fat_access.h → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_access.h b/...2Disk/Lib/fat_io_lib/include/fat_access.h → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_access.h
diff --git a/...y2Disk/Lib/fat_io_lib/release/fat_cache.c → ...UI/Ventoy2Disk/Lib/fat_io_lib/fat_cache.c b/...y2Disk/Lib/fat_io_lib/release/fat_cache.c → ...UI/Ventoy2Disk/Lib/fat_io_lib/fat_cache.c
diff --git a/...y2Disk/Lib/fat_io_lib/include/fat_cache.h → ...UI/Ventoy2Disk/Lib/fat_io_lib/fat_cache.h b/...y2Disk/Lib/fat_io_lib/include/fat_cache.h → ...UI/Ventoy2Disk/Lib/fat_io_lib/fat_cache.h
diff --git a/...oy2Disk/Lib/fat_io_lib/include/fat_defs.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_defs.h b/...oy2Disk/Lib/fat_io_lib/include/fat_defs.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_defs.h
diff --git a/...Disk/Lib/fat_io_lib/release/fat_filelib.c → .../Ventoy2Disk/Lib/fat_io_lib/fat_filelib.c b/...Disk/Lib/fat_io_lib/release/fat_filelib.c → .../Ventoy2Disk/Lib/fat_io_lib/fat_filelib.c
diff --git a/...Disk/Lib/fat_io_lib/include/fat_filelib.h → .../Ventoy2Disk/Lib/fat_io_lib/fat_filelib.h b/...Disk/Lib/fat_io_lib/include/fat_filelib.h → .../Ventoy2Disk/Lib/fat_io_lib/fat_filelib.h
diff --git a/...2Disk/Lib/fat_io_lib/release/fat_format.c → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_format.c b/...2Disk/Lib/fat_io_lib/release/fat_format.c → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_format.c
diff --git a/...2Disk/Lib/fat_io_lib/include/fat_format.h → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_format.h b/...2Disk/Lib/fat_io_lib/include/fat_format.h → ...I/Ventoy2Disk/Lib/fat_io_lib/fat_format.h
diff --git a/...oy2Disk/Lib/fat_io_lib/include/fat_list.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_list.h b/...oy2Disk/Lib/fat_io_lib/include/fat_list.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_list.h
diff --git a/...oy2Disk/Lib/fat_io_lib/release/fat_misc.c → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_misc.c b/...oy2Disk/Lib/fat_io_lib/release/fat_misc.c → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_misc.c
diff --git a/...oy2Disk/Lib/fat_io_lib/include/fat_misc.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_misc.h b/...oy2Disk/Lib/fat_io_lib/include/fat_misc.h → ...GUI/Ventoy2Disk/Lib/fat_io_lib/fat_misc.h