2025-07-31 02:42:24 +00:00
1255 changed files with 4360 additions and 148695 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -2,11 +2,11 @@

 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: Ventoy
-open_collective: ventoy
+liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://www.paypal.me/ventoy', 'https://www.ventoy.net/en/donation.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.ventoy.net/en/donation.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@ -1,110 +0,0 @@
-name: Issue Report
-description: File an issue report
-title: "[issue]: "
-assignees:
-  - octocat
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this issue report!
-  - type: checkboxes
-    id: faq
-    attributes:
-      label: Official FAQ
-      description: Have you checked the official FAQ at [https://www.ventoy.net/en/faq.html](https://www.ventoy.net/en/faq.html) ?
-      options:
-        - label: I have checked the official FAQ. 
-          required: true
-  - type: input
-    id: version
-    attributes:
-      label: Ventoy Version
-      description: What version of ventoy are you running?
-      placeholder: 1.0.96
-    validations:
-      required: true
-  - type: dropdown
-    id: latestrelease
-    attributes:
-      label: What about latest release
-      description: Have you tried with the latest release of Ventoy?
-      options:
-        - Yes. I have tried the latest release, but the bug still exist.
-        - No. I didn't try the latest release.
-    validations:
-      required: true
-  - type: dropdown
-    id: alternativemode
-    attributes:
-      label: Try alternative boot mode
-      description: Have you tried alternative boot mode? (wimboot mode for Windows/WinPE, grub2 mode for linux)
-      options:
-        - Yes. I have tried them, but the bug still exist.
-        - No. I didn't try these alternative boot modes.
-    validations:
-      required: true
-  - type: dropdown
-    id: bios
-    attributes:
-      label: BIOS Mode
-      description: In which BIOS mode did you find the bug?
-      options:
-        - Legacy BIOS Mode
-        - UEFI Mode
-        - Both
-    validations:
-      required: true
-  - type: dropdown
-    id: partstyle
-    attributes:
-      label: Partition Style
-      description: Which partition style did you select when you install Ventoy?
-      options:
-        - MBR
-        - GPT
-    validations:
-      required: true
-  - type: input
-    id: capacity
-    attributes:
-      label: Disk Capacity
-      description: What is the capacity of the disk installed with Ventoy?
-      placeholder: 32GB
-    validations:
-      required: true
-  - type: input
-    id: vendor
-    attributes:
-      label: Disk Manufacturer
-      description: What is the manufacturer of the disk installed with Ventoy? (e.g. SanDisk/Kingston...)      
-    validations:
-      required: false
-  - type: dropdown
-    id: checksum
-    attributes:
-      label: Image file checksum (if applicable)
-      description: Have you checked the image file in Ventoy's menu as [https://www.ventoy.net/en/faq.html#faq_boot_checksum](https://www.ventoy.net/en/faq.html#faq_boot_checksum) ?
-      options:
-        - Yes.
-        - No.        
-    validations:
-      required: false
-  - type: input
-    id: link
-    attributes:
-      label: Image file download link (if applicable)
-      description: What is the image file download link?
-      placeholder: https://xxx
-    validations:
-      required: false
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Tell me what happened. It's highly recommended to include some photo or video about the bug.
-      placeholder: Tell us what you see!
-      value: "A bug happened!"
-    validations:
-      required: true
-
--- a/.github/ISSUE_TEMPLATE/success_image_report.yml
+++ b/.github/ISSUE_TEMPLATE/success_image_report.yml
@ -1,101 +0,0 @@
-name: Success Image Report
-description: To report an image file that boot successfully in Ventoy and is not yet listed in https://www.ventoy.net/en/isolist.html
-title: "[Success Image Report]: "
-assignees:
-  - octocat
-body:
-  - type: markdown
-    attributes:
-      value: |
-        I list all the successfully tested image files in the official website: https://www.ventoy.net/en/isolist.html   
-        If you successfully test an image file which is not listed in the above page, you can tell me and I will be very glad to add it to the tested list.
-  - type: checkboxes
-    id: faq
-    attributes:
-      label: Official Website List
-      description: Have you checked the list at [https://www.ventoy.net/en/isolist.html](https://www.ventoy.net/en/isolist.html) and the image file is not listed?
-      options:
-        - label: I have checked the list in official website and the image file is not listed there. 
-          required: true
-  - type: input
-    id: version
-    attributes:
-      label: Ventoy Version
-      description: What version of ventoy did you test with the image file.
-      placeholder: 1.0.57
-    validations:
-      required: true
-  - type: dropdown
-    id: bios
-    attributes:
-      label: BIOS Mode
-      description: In which BIOS mode did you successfully test the image file? (It's recommended to test in both mode)
-      options:
-        - Legacy BIOS Mode
-        - UEFI Mode
-        - Both
-    validations:
-      required: true
-  - type: dropdown
-    id: partstyle
-    attributes:
-      label: Partition Style
-      description: Which partition style did you use with Ventoy?
-      options:
-        - MBR
-        - GPT
-    validations:
-      required: true
-  - type: input
-    id: filename
-    attributes:
-      label: Image file name
-      description: The successfully tested image file name.
-      placeholder: xxxx.iso
-    validations:
-      required: true
-  - type: dropdown
-    id: checksum
-    attributes:
-      label: Image file checksum type
-      description: 
-      options:
-        - MD5
-        - SHA1        
-        - SHA256        
-        - SHA512        
-    validations:
-      required: true
-  - type: input
-    id: checkvalue
-    attributes:
-      label: Image file checksum value
-      description: What is the image file checksum value corresponding to the above checksum type?
-      placeholder: xxxx
-    validations:
-      required: true
-  - type: input
-    id: link
-    attributes:
-      label: Image file download link (if applicable)
-      description: What is the image file download link?
-      placeholder: https://xxx
-    validations:
-      required: false
-  - type: input
-    id: testenv
-    attributes:
-      label: Test environment
-      description: The manufacturer/model and other details about your computer (or VM).
-      placeholder: Lenovo Thinkpad T420 laptop
-    validations:
-      required: true
-  - type: textarea
-    id: details
-    attributes:
-      label: More Details?
-      description: You can give more details here.
-      value: "This image file booted successfully in Ventoy."
-    validations:
-      required: false
-
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -12,26 +12,22 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
-    - name: Run docker compose up
-      run: docker compose up
-    - uses: actions/upload-artifact@v4
+    - uses: actions/checkout@v2
+    - name: Run docker-compose up
+      run: docker-compose up
+    - uses: actions/upload-artifact@v2
      with:
        name: ventoy-windows
        path: INSTALL/ventoy-*windows*
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v2
      with:
        name: ventoy-linux
        path: INSTALL/ventoy-*linux*
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v2
      with:
        name: ventoy-livecd
        path: INSTALL/ventoy-*livecd*
-    - uses: actions/upload-artifact@v4
-      with:
-        name: SHA256SUM
-        path: INSTALL/sha256.txt
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v2
      with:
        name: xxx-build-log
        path: DOC/build.log
--- a/.github/workflows/sync2gitee.yml
+++ b/.github/workflows/sync2gitee.yml
@ -11,7 +11,6 @@ on:
 jobs:
  run:
    name: Sync-GitHub-to-Gitee
-    if: ${{ github.repository_owner == 'ventoy' }}
    runs-on: ubuntu-latest
    steps:
    - name: Mirror the Github repos to Gitee.
--- a/BLOB_List.md
+++ b/BLOB_List.md
@ -1,193 +0,0 @@
-
-<table>
-    <thead>
-        <tr>
-            <th>BLOB</th>
-            <th>File Source</th>
-            <th>Desc</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr> <td>./BUSYBOX/chmod/vtchmod32</td>          <td rowspan=5>build</td>   <td rowspan=5>Build Instructions:<br/> ./BUSYBOX/chmod/build.sh</td>          </tr>
-        <tr> <td>./BUSYBOX/chmod/vtchmod64</td>          </tr>
-        <tr> <td>./BUSYBOX/chmod/vtchmod64_musl</td>     </tr>
-        <tr> <td>./BUSYBOX/chmod/vtchmodaa64</td>        </tr>
-        <tr> <td>./BUSYBOX/chmod/vtchmodm64e</td>        </tr>
-        <tr> <td>./cryptsetup/veritysetup32</td>         <td rowspan=2>build</td>   <td rowspan=2>Build Instructions:<br/> ./cryptsetup/cryptsetup-build.txt</td>                                     </tr>
-        <tr> <td>./cryptsetup/veritysetup64</td>         </tr>
-        <tr> <td>./DMSETUP/dmsetup32</td>                <td rowspan=4>build</td>   <td rowspan=4>Build Instructions:<br/> ./DMSETUP/build.txt</td>          </tr>
-        <tr> <td>./DMSETUP/dmsetup64</td>                </tr>
-        <tr> <td>./DMSETUP/dmsetupaa64</td>              </tr>
-        <tr> <td>./DMSETUP/dmsetupm64e</td>              </tr>
-        <tr> <td>./FUSEISO/vtoy_fuse_iso_32</td>         <td rowspan=3>build</td>   <td rowspan=3>Build Instructions:<br/> ./FUSEISO/build.sh<br/>./FUSEISO/build_aarch64.sh<br/>./FUSEISO/build_libfuse.sh<br/>./FUSEISO/build_libfuse_aarch64.sh </td>                                     </tr>
-        <tr> <td>./FUSEISO/vtoy_fuse_iso_64</td>         </tr>
-        <tr> <td>./FUSEISO/vtoy_fuse_iso_aa64</td>       </tr>
-        <tr> <td>./IMG/cpio_arm64/ventoy/busybox/a64</td>  <td>build</td>    <td>Build Instructions:<br/>./BUSYBOX/build.txt  ash</td>      </tr>
-        <tr> <td>./IMG/cpio_arm64/ventoy/busybox/vtchmodaa64</td> <td>build</td>  <td>Same with ./BUSYBOX/chmod/vtchmodaa64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_arm64/ventoy/busybox/xzminidecaa64</td> <td>build</td>  <td>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt  4.17</td>    </tr>
-        <tr> <td>./IMG/cpio_arm64/ventoy/tool/lz4cataa64</td> <td>build</td>  <td>Same with ./LZIP/lz4cataa64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_arm64/ventoy/tool/zstdcataa64</td> <td>build</td>  <td>Same with ./ZSTD/zstdcataa64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_mips64/ventoy/busybox/m64</td> <td>build</td>    <td>Build Instructions:<br/>./BUSYBOX/build.txt  ash</td>      </tr>
-        <tr> <td>./IMG/cpio_mips64/ventoy/busybox/vtchmodm64e</td> <td>build</td> <td>Same with ./BUSYBOX/chmod/vtchmodm64e<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_mips64/ventoy/busybox/xzminidecm64e</td> <td>build</td>  <td>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt  4.18</td>    </tr>
-        <tr> <td>./IMG/cpio_mips64/ventoy/tool/lz4catm64e</td> <td>build</td>  <td>Same with ./LZIP/lz4catm64e<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/64h</td> <td>build</td>    <td>Build Instructions:<br/>./BUSYBOX/build.txt  ash</td>      </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/ash</td> <td>upstream</td>    <td>Download from BusyBox website.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.4</td>      </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/vtchmod32</td> <td>build</td>   <td>Same with ./BUSYBOX/chmod/vtchmod32<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/vtchmod64</td> <td>build</td>   <td>Same with ./BUSYBOX/chmod/vtchmod64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/vtchmod64_musl</td> <td>build</td>   <td>Same with ./BUSYBOX/chmod/vtchmod64_musl<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/xzminidec32</td> <td>build</td>  <td>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt  4.15</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/xzminidec64</td> <td>build</td>  <td>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt  4.16</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/xzminidec64_musl</td> <td>build</td>  <td>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt  4.16</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/ar</td> <td>upstream</td>    <td>Download from BusyBox website.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.2</td>      </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/inotifyd</td> <td>upstream</td>    <td>Download from BusyBox website.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.3</td>      </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/lz4cat</td> <td>upstream</td>    <td>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.1</td>      </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/lz4cat64</td> <td>build</td>  <td>Build Instructions:<br/>./LZIP/buildlz4.txt</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/zstdcat</td> <td>build</td>  <td>Same with ./ZSTD/zstdcat<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/tool/zstdcat64</td> <td>build</td>  <td>Same with ./ZSTD/zstdcat64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./INSTALL/EFI/BOOT/BOOTAA64.EFI</td> <td rowspan=4>build</td>  <td rowspan=4>Build Instructions:<br/> ./DOC/BuildVentoyFromSource.txt 4.1-Build grub2</td>                                     </tr>        
-        <tr> <td>./INSTALL/EFI/BOOT/BOOTMIPS.EFI</td>     
-        <tr> <td>./INSTALL/EFI/BOOT/grubia32_real.efi</td>
-        <tr> <td>./INSTALL/EFI/BOOT/grubx64_real.efi</td>
-        <tr> <td>./INSTALL/EFI/BOOT/grub.efi</td> <td rowspan=6>upstream</td>    <td rowspan=6>https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk </td>      </tr>        
-        <tr> <td>./INSTALL/EFI/BOOT/BOOTIA32.EFI</td> 
-        <tr> <td>./INSTALL/EFI/BOOT/BOOTX64.EFI</td> 
-        <tr> <td>./INSTALL/EFI/BOOT/grubia32.efi</td>
-        <tr> <td>./INSTALL/EFI/BOOT/mmia32.efi</td>
-        <tr> <td>./INSTALL/EFI/BOOT/MokManager.efi</td>
-        <tr> <td>./INSTALL/tool/aarch64/ash</td> <td rowspan=12>build</td>    <td rowspan=12>Build Instructions:<br/>./DOC/BUSYBOX/build.txt</td>    </tr>
-        <tr> <td>./INSTALL/tool/aarch64/hexdump</td>
-        <tr> <td>./INSTALL/tool/aarch64/xzcat</td>
-        <tr> <td>./INSTALL/tool/i386/ash</td>
-        <tr> <td>./INSTALL/tool/i386/hexdump</td>
-        <tr> <td>./INSTALL/tool/i386/xzcat</td>
-        <tr> <td>./INSTALL/tool/mips64el/ash</td>
-        <tr> <td>./INSTALL/tool/mips64el/hexdump</td>
-        <tr> <td>./INSTALL/tool/mips64el/xzcat</td>
-        <tr> <td>./INSTALL/tool/x86_64/ash</td>
-        <tr> <td>./INSTALL/tool/x86_64/hexdump</td>
-        <tr> <td>./INSTALL/tool/x86_64/xzcat</td>
-        <tr> <td>./INSTALL/tool/aarch64/Ventoy2Disk.gtk3</td> <td rowspan=6>build</td>    <td rowspan=6>Build Instructions:<br/>./LinuxGUI/build_gtk.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/Ventoy2Disk.gtk3</td>
-        <tr> <td>./INSTALL/tool/i386/Ventoy2Disk.gtk2</td>
-        <tr> <td>./INSTALL/tool/mips64el/Ventoy2Disk.gtk3</td>
-        <tr> <td>./INSTALL/tool/x86_64/Ventoy2Disk.gtk3</td>
-        <tr> <td>./INSTALL/tool/x86_64/Ventoy2Disk.gtk2</td>
-        <tr> <td>./INSTALL/tool/aarch64/Ventoy2Disk.qt5</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./LinuxGUI/build_qt.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/Ventoy2Disk.qt5</td>
-        <tr> <td>./INSTALL/tool/mips64el/Ventoy2Disk.qt5</td>
-        <tr> <td>./INSTALL/tool/x86_64/Ventoy2Disk.qt5</td>
-        <tr> <td>./INSTALL/tool/aarch64/Plugson</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./Plugson/build.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/Plugson</td>
-        <tr> <td>./INSTALL/tool/mips64el/Plugson</td>
-        <tr> <td>./INSTALL/tool/x86_64/Plugson</td>
-        <tr> <td>./INSTALL/tool/aarch64/V2DServer</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./LinuxGUI/build.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/V2DServer</td>
-        <tr> <td>./INSTALL/tool/mips64el/V2DServer</td>
-        <tr> <td>./INSTALL/tool/x86_64/V2DServer</td>
-        <tr> <td>./INSTALL/tool/aarch64/mkexfatfs</td> <td rowspan=8>build</td>    <td rowspan=8>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt 4.9<br/>./ExFAT/buidexfat.sh<br/>./ExFAT/buidexfat_aarch64.sh<br/>./ExFAT/buidlibfuse.sh<br/>./ExFAT/buidlibfuse_aarch64.sh<br/></td>    </tr>
-        <tr> <td>./INSTALL/tool/aarch64/mount.exfat-fuse</td>
-        <tr> <td>./INSTALL/tool/i386/mkexfatfs</td>
-        <tr> <td>./INSTALL/tool/i386/mount.exfat-fuse</td>
-        <tr> <td>./INSTALL/tool/mips64el/mkexfatfs</td>
-        <tr> <td>./INSTALL/tool/mips64el/mount.exfat-fuse</td>
-        <tr> <td>./INSTALL/tool/x86_64/mkexfatfs</td>
-        <tr> <td>./INSTALL/tool/x86_64/mount.exfat-fuse</td>    
-        <tr> <td>./INSTALL/tool/aarch64/vlnk</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./Vlnk/build.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/vlnk</td>
-        <tr> <td>./INSTALL/tool/mips64el/vlnk</td>
-        <tr> <td>./INSTALL/tool/x86_64/vlnk</td>
-        <tr> <td>./INSTALL/tool/aarch64/vtoycli</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./vtoycli/build.sh</td>    </tr>
-        <tr> <td>./INSTALL/tool/i386/vtoycli</td>
-        <tr> <td>./INSTALL/tool/mips64el/vtoycli</td>
-        <tr> <td>./INSTALL/tool/x86_64/vtoycli</td>
-        <tr> <td>./INSTALL/ventoy/imdisk/32/imdisk.cpl</td>  <td rowspan=6>upstream</td>  <td rowspan=6>Download from imdisk project.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.8</td>      </tr>
-        <tr> <td>./INSTALL/ventoy/imdisk/32/imdisk.exe</td>
-        <tr> <td>./INSTALL/ventoy/imdisk/32/imdisk.sys</td>
-        <tr> <td>./INSTALL/ventoy/imdisk/64/imdisk.cpl</td>
-        <tr> <td>./INSTALL/ventoy/imdisk/64/imdisk.exe</td>
-        <tr> <td>./INSTALL/ventoy/imdisk/64/imdisk.sys</td>
-        <tr> <td>./INSTALL/ventoy/iso9660_aa64.efi</td> <td rowspan=6>build</td>    <td rowspan=6>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt 4.17</td>    </tr>
-        <tr> <td>./INSTALL/ventoy/udf_aa64.efi</td>
-        <tr> <td>./INSTALL/ventoy/iso9660_ia32.efi</td>
-        <tr> <td>./INSTALL/ventoy/udf_ia32.efi</td>
-        <tr> <td>./INSTALL/ventoy/iso9660_x64.efi</td>
-        <tr> <td>./INSTALL/ventoy/udf_x64.efi</td>
-        <tr> <td>./INSTALL/VentoyGUI.aarch64</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./LinuxGUI/build_gtk.sh</td>    </tr>
-        <tr> <td>./INSTALL/VentoyGUI.i386</td>
-        <tr> <td>./INSTALL/VentoyGUI.mips64el</td>
-        <tr> <td>./INSTALL/VentoyGUI.x86_64</td>
-        <tr> <td>./INSTALL/Ventoy2Disk.exe</td> <td rowspan=4>build</td>    <td rowspan=4>Build Instructions:<br/>./Ventoy2Disk/Ventoy2Disk.sln</td>    </tr>
-        <tr> <td>./INSTALL/Ventoy2Disk_ARM.exe</td>
-        <tr> <td>./INSTALL/Ventoy2Disk_ARM64.exe</td>
-        <tr> <td>./INSTALL/Ventoy2Disk_X64.exe</td>
-        <tr> <td>./INSTALL/ventoy/vtoyjump32.exe</td> <td rowspan=2>build</td>    <td rowspan=2>Build Instructions:<br/>./vtoyjump/vtoyjump.sln</td>    </tr>
-        <tr> <td>./INSTALL/ventoy/vtoyjump64.exe</td>
-        <tr> <td>./INSTALL/ventoy/ventoy_aa64.efi</td>  <td rowspan=6>build</td>  <td rowspan=6>Build Instructions:<br/>./EDK2/buildedk.sh</td>    </tr>
-        <tr> <td>./INSTALL/ventoy/ventoy_ia32.efi</td>
-        <tr> <td>./INSTALL/ventoy/ventoy_x64.efi</td>
-        <tr> <td>./INSTALL/ventoy/vtoyutil_aa64.efi</td>
-        <tr> <td>./INSTALL/ventoy/vtoyutil_ia32.efi</td>
-        <tr> <td>./INSTALL/ventoy/vtoyutil_x64.efi</td>
-        <tr> <td>./INSTALL/ventoy/ipxe.krn</td> <td>build</td>  <td>Build Instructions:<br/>./IPXE/buildipxe.sh</td>    </tr>
-        <tr> <td>./INSTALL/ventoy/memdisk</td> <td>upstream</td>  <td>Download from syslinux project.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.9</td>      </tr>        
-        <tr> <td>./LiveCD/ISO/EFI/boot/vmlinuz64</td> <td>upstream</td>  <td>Download from TinyLinux website.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.14</td>      </tr>
-        <tr> <td>./LiveCDGUI/EXT/busybox-x86_64</td> <td>build</td>  <td>Same with ./IMG/cpio_x86/ventoy/busybox/busybox64<br/>Check the file hash to confirm</td>    </tr>
-        <tr> <td>./LiveCDGUI/GRUB/bootx64.efi</td> <td rowspan=2>build</td>  <td rowspan=2>./DOC/BuildVentoyFromSource.txt 4.1-Build grub2</td>    </tr>
-        <tr> <td>./LiveCD/GRUB/bootx64.efi</td>
-        <tr> <td>./LZIP/lunzip32</td> <td rowspan=3>build</td>  <td rowspan=3>Build Instructions:<br/>./DOC/BuildVentoyFromSource.txt 4.19</td>    </tr>
-        <tr> <td>./LZIP/lunzip64</td>
-        <tr> <td>./LZIP/lunzipaa64</td>
-        <tr> <td>./LZIP/lz4cat64</td> <td rowspan=3>build</td>  <td rowspan=3>Build Instructions:<br/>./LZIP/buildlz4.txt</td>    </tr>
-        <tr> <td>./LZIP/lz4cataa64</td>
-        <tr> <td>./LZIP/lz4catm64e</td>
-        <tr> <td>./Plugson/vs/VentoyPlugson/Release/VentoyPlugson.exe</td> <td rowspan=2>build</td>    <td rowspan=2>Build Instructions:<br/>./Plugson/vs/VentoyPlugson/VentoyPlugson.sln</td>    </tr>
-        <tr> <td>./Plugson/vs/VentoyPlugson/x64/Release/VentoyPlugson_X64.exe</td>
-        <tr> <td>./SQUASHFS/unsquashfs_32</td> <td rowspan=3>build</td>    <td rowspan=3>Build Instructions:<br/>./SQUASHFS/build.sh</td>    </tr>
-        <tr> <td>./SQUASHFS/unsquashfs_64</td>
-        <tr> <td>./SQUASHFS/unsquashfs_aa64</td>
-        <tr> <td>./Unix/ventoy_unix/DragonFly/sbin/dmsetup</td> <td>upstream</td>   <td>Get from DragonFly ISO.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.13</td>      </tr>
-        <tr> <td>./Unix/ventoy_unix/DragonFly/sbin/init</td> <td>build</td>    <td>Build Instructions:<br/>./Unix/ventoy_unix_src/DragonFly/build.sh</td>    </tr>
-        <tr> <td>./VBLADE/vblade-master/vblade_32</td> <td rowspan=3>build</td>    <td rowspan=3>Build Instructions:<br/>./VBLADE/vblade-master/build.sh</td>    </tr>
-        <tr> <td>./VBLADE/vblade-master/vblade_64</td>
-        <tr> <td>./VBLADE/vblade-master/vblade_aa64</td>
-        <tr> <td>./Vlnk/vs/VentoyVlnk/Release/VentoyVlnk.exe</td> <td>build</td>     <td>Build Instructions:<br/>./Vlnk/vs/VentoyVlnk/VentoyVlnk.sln</td>    </tr>
-        <tr> <td>./VtoyTool/vtoytool/00/vtoytool_32</td> <td rowspan=6>build</td>    <td rowspan=6>Build Instructions:<br/>./VtoyTool/build.sh</td>    </tr>
-        <tr> <td>./VtoyTool/vtoytool/00/vtoytool_64</td>
-        <tr> <td>./VtoyTool/vtoytool/00/vtoytool_aa64</td>
-        <tr> <td>./VtoyTool/vtoytool/00/vtoytool_m64e</td>
-        <tr> <td>./VtoyTool/vtoytool/01/vtoytool_64</td>
-        <tr> <td>./VtoyTool/vtoytool/02/vtoytool_64</td>
-        <tr> <td>./ZSTD/zstdcat</td> <td rowspan=3>build</td>    <td rowspan=3>Build Instructions:<br/>./ZSTD/build.txt</td>    </tr>
-        <tr> <td>./ZSTD/zstdcat64</td>
-        <tr> <td>./ZSTD/zstdcataa64</td>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/busybox32</td> <td rowspan=6>build</td>    <td rowspan=6>Build Instructions:<br/>./BUSYBOX/build.txt full busybox</td>    </tr>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/busybox64</td>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/xzcat32_musl</td>
-        <tr> <td>./IMG/cpio_x86/ventoy/busybox/xzcat64_musl</td>
-        <tr> <td>./IMG/cpio_arm64/ventoy/busybox/busyboxaa64</td>
-        <tr> <td>./IMG/cpio_mips64/ventoy/busybox/busyboxm64e</td>          
-        <tr> <td>ISNTALL/ventoy/7z/64/7za.exe</td>  <td rowspan=2>upstream</td>  <td>Download from 7z project.<br/>URL & File Hash documented in<br/> ./DOC/BuildVentoyFromSource.txt 5.12</td>      </tr>
-        <tr> <td>ISNTALL/ventoy/7z/32/7za.exe</td>  
-        <tr> <td>./INSTALL/ventoy/wimboot.i386.efi</td> <td rowspan=2>build</td>    <td rowspan=2>Build Instructions:<br/>./wimboot/build.sh</td>    </tr>
-        <tr> <td>./INSTALL/ventoy/wimboot.x86_64</td>        
-        <tr> <td> ./Unix/ventoy_unix/ClonOS/geom_ventoy_ko/13.x/64/geom_ventoy.ko</td> <td rowspan=18>build</td>    <td rowspan=18>Build Instructions:<br/>./Unix/BuildUnixKmod.txt</td>    </tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/10.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/10.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/11.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/11.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/12.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/12.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/14.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/14.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/9.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/9.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/MidnightBSD/geom_ventoy_ko/11.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/MidnightBSD/geom_ventoy_ko/11.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/MidnightBSD/geom_ventoy_ko/2.x/32/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/MidnightBSD/geom_ventoy_ko/2.x/64/geom_ventoy.ko</td></tr>
-        <tr> <td> ./Unix/ventoy_unix/pfSense/geom_ventoy_ko/14.x/64/geom_ventoy.ko</td></tr>
-    </tbody>
-</table>
--- a/BUSYBOX/chmod/build.sh
+++ b/BUSYBOX/chmod/build.sh
@ -1,11 +1,9 @@
 #!/bin/sh

-DSTDIR1=../../IMG/cpio_x86/ventoy/busybox
-DSTDIR2=../../IMG/cpio_arm64/ventoy/busybox
-DSTDIR3=../../IMG/cpio_mips64/ventoy/busybox
+DSTDIR=../../IMG/cpio/ventoy/busybox

 rm -f vtchmod32 vtchmod64 vtchmod64_musl vtchmodaa64
-rm -f $DSTDIR1/vtchmod32 $DSTDIR1/vtchmod64 $DSTDIR2/vtchmodaa64 $DSTDIR3/vtchmodm64e
+rm -f $DSTDIR/vtchmod32 $DSTDIR/vtchmod64 $DSTDIR/vtchmodaa64 $DSTDIR/vtchmodm64e

 /opt/diet32/bin/diet  gcc  -Os -m32  vtchmod.c -o  vtchmod32
 /opt/diet64/bin/diet  gcc  -Os       vtchmod.c -o  vtchmod64
@ -25,9 +23,9 @@ chmod 777 vtchmodaa64
 chmod 777 vtchmod64_musl
 chmod 777 vtchmodm64e

-cp -a vtchmod32 $DSTDIR1/
-cp -a vtchmod64 $DSTDIR1/
-cp -a vtchmod64_musl $DSTDIR1/
-cp -a vtchmodaa64 $DSTDIR2/
-cp -a vtchmodm64e $DSTDIR3/
+cp -a vtchmod32 $DSTDIR/
+cp -a vtchmod64 $DSTDIR/
+cp -a vtchmodaa64 $DSTDIR/
+cp -a vtchmod64_musl $DSTDIR/
+cp -a vtchmodm64e $DSTDIR/

--- a/BUSYBOX/chmod/vtchmod.c
+++ b/BUSYBOX/chmod/vtchmod.c
@ -1,8 +1,5 @@
-#include <stdio.h>
-#include <string.h>
 #include <sys/types.h>  
 #include <sys/stat.h>
-#include <sys/utsname.h>

 int main(int argc, char **argv)
 {
@ -10,25 +7,7 @@ int main(int argc, char **argv)
    {
        return 1;
    }
-
-    if (argv[1][0] == '-' && argv[1][1] == '6')
-    {
-        struct utsname buf;
-        if (0 == uname(&buf))
-        {
-            if (strstr(buf.machine, "amd64"))
-            {
-                return 0;
-            }
-            
-            if (strstr(buf.machine, "x86_64"))
-            {
-                return 0;
-            }
-        }
-        return 1;
-    }
-
+    
    return chmod(argv[1], 0777);
 }

--- a/BUSYBOX/chmod/vtchmod32
+++ b/BUSYBOX/chmod/vtchmod32
--- a/BUSYBOX/chmod/vtchmod64
+++ b/BUSYBOX/chmod/vtchmod64
--- a/BUSYBOX/chmod/vtchmod64_musl
+++ b/BUSYBOX/chmod/vtchmod64_musl
--- a/BUSYBOX/chmod/vtchmodaa64
+++ b/BUSYBOX/chmod/vtchmodaa64
--- a/BUSYBOX/chmod/vtchmodm64e
+++ b/BUSYBOX/chmod/vtchmodm64e
--- a/DMPATCH/Makefile
+++ b/DMPATCH/Makefile
@ -1,7 +0,0 @@
-
-obj-m += dm_patch.o
-
-EXTRA_CFLAGS := -Wall
-
-dm_patch-objs := dmpatch.o
-
--- a/DMPATCH/Makefile_IBT
+++ b/DMPATCH/Makefile_IBT
@ -1,7 +0,0 @@
-
-obj-m += dm_patch_ibt.o
-
-EXTRA_CFLAGS := -Wall -DVTOY_IBT -fcf-protection=branch -mindirect-branch-register
-
-dm_patch_ibt-objs := dmpatch.o
-
--- a/DMPATCH/dmpatch.c
+++ b/DMPATCH/dmpatch.c
@ -1,632 +0,0 @@
-/******************************************************************************
- * dmpatch.c  ---- patch for device-mapper
- *
- * Copyright (c) 2021, longpanda <admin@ventoy.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/mutex.h>
-#include <linux/mempool.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#include <linux/slab.h>
-
-#define MAX_PATCH   4
-
-#define magic_sig 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF
-
-typedef int (*kprobe_reg_pf)(void *);
-typedef void (*kprobe_unreg_pf)(void *);
-typedef int (*printk_pf)(const char *fmt, ...);
-typedef int (*set_memory_attr_pf)(unsigned long addr, int numpages);
-
-#pragma pack(1)
-typedef struct ko_param
-{
-    unsigned char magic[16];
-    unsigned long struct_size;
-    unsigned long pgsize;
-    unsigned long printk_addr;
-    unsigned long ro_addr;
-    unsigned long rw_addr;
-    unsigned long reg_kprobe_addr;
-    unsigned long unreg_kprobe_addr;
-    unsigned long sym_get_addr;
-    unsigned long sym_get_size;
-    unsigned long sym_put_addr;
-    unsigned long sym_put_size;
-    unsigned long kv_major;
-    unsigned long ibt;
-    unsigned long kv_minor;
-    unsigned long blkdev_get_addr;
-    unsigned long blkdev_put_addr;
-    unsigned long bdev_open_addr;
-    unsigned long kv_subminor;
-    unsigned long bdev_file_open_addr;
-    unsigned long padding[1];
-}ko_param;
-
-#pragma pack()
-
-static printk_pf kprintf = NULL;
-static set_memory_attr_pf set_mem_ro = NULL;
-static set_memory_attr_pf set_mem_rw = NULL;
-static kprobe_reg_pf reg_kprobe = NULL;
-static kprobe_unreg_pf unreg_kprobe = NULL;
-
-static volatile ko_param g_ko_param = 
-{
-    { magic_sig },
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-#if defined(CONFIG_X86_64)
-#define PATCH_OP_POS1    3
-#define CODE_MATCH1(code, i) \
-    (code[i] == 0x40 && code[i + 1] == 0x80 && code[i + 2] == 0xce && code[i + 3] == 0x80)
-
-#define PATCH_OP_POS2    1
-#define CODE_MATCH2(code, i) \
-    (code[i] == 0x0C && code[i + 1] == 0x80 && code[i + 2] == 0x89 && code[i + 3] == 0xC6)
-    
-#define PATCH_OP_POS3    4
-#define CODE_MATCH3(code, i) \
-    (code[i] == 0x44 && code[i + 1] == 0x89 && code[i + 2] == 0xe8 && code[i + 3] == 0x0c && code[i + 4] == 0x80)
-
-
-
-
-
-#elif defined(CONFIG_X86_32)
-#define PATCH_OP_POS1    2
-#define CODE_MATCH1(code, i) \
-    (code[i] == 0x80 && code[i + 1] == 0xca && code[i + 2] == 0x80 && code[i + 3] == 0xe8)
-
-#define PATCH_OP_POS2    PATCH_OP_POS1
-#define CODE_MATCH2      CODE_MATCH1
-#define PATCH_OP_POS3    PATCH_OP_POS1
-#define CODE_MATCH3      CODE_MATCH1
-
-
-#else
-#error "unsupported arch"
-#endif
-
-#ifdef VTOY_IBT
-#ifdef CONFIG_X86_64
-/* Using 64-bit values saves one instruction clearing the high half of low */
-#define DECLARE_ARGS(val, low, high)	unsigned long low, high
-#define EAX_EDX_VAL(val, low, high)	((low) | (high) << 32)
-#define EAX_EDX_RET(val, low, high)	"=a" (low), "=d" (high)
-#else
-#define DECLARE_ARGS(val, low, high)	unsigned long long val
-#define EAX_EDX_VAL(val, low, high)	(val)
-#define EAX_EDX_RET(val, low, high)	"=A" (val)
-#endif
-
-#define	EX_TYPE_WRMSR			 8
-#define	EX_TYPE_RDMSR			 9
-#define MSR_IA32_S_CET			0x000006a2 /* kernel mode cet */
-#define CET_ENDBR_EN			(1ULL << 2)
-
-/* Exception table entry */
-#ifdef __ASSEMBLY__
-
-#define _ASM_EXTABLE_TYPE(from, to, type)			\
-	.pushsection "__ex_table","a" ;				\
-	.balign 4 ;						\
-	.long (from) - . ;					\
-	.long (to) - . ;					\
-	.long type ;						\
-	.popsection
-
-#else /* ! __ASSEMBLY__ */
-
-#define _ASM_EXTABLE_TYPE(from, to, type)			\
-	" .pushsection \"__ex_table\",\"a\"\n"			\
-	" .balign 4\n"						\
-	" .long (" #from ") - .\n"				\
-	" .long (" #to ") - .\n"				\
-	" .long " __stringify(type) " \n"			\
-	" .popsection\n"
-
-#endif /* __ASSEMBLY__ */
-#endif /* VTOY_IBT */
-
-
-
-
-
-
-#define vdebug(fmt, args...) if(kprintf) kprintf(KERN_ERR fmt, ##args)
-
-static unsigned int g_claim_ptr = 0;
-static unsigned char *g_get_patch[MAX_PATCH] = { NULL };
-static unsigned char *g_put_patch[MAX_PATCH] = { NULL };
-
-static int notrace dmpatch_kv_above(unsigned long Major, unsigned long Minor, unsigned long SubMinor)
-{
-    if (g_ko_param.kv_major != Major)
-    {
-        return (g_ko_param.kv_major > Major) ? 1 : 0;
-    }
-
-    if (g_ko_param.kv_minor != Minor)
-    {
-        return (g_ko_param.kv_minor > Minor) ? 1 : 0;
-    }
-
-    if (g_ko_param.kv_subminor != SubMinor)
-    {
-        return (g_ko_param.kv_subminor > SubMinor) ? 1 : 0;
-    }
-
-    return 1;
-}
-
-static void notrace dmpatch_restore_code(int bytes, unsigned char *opCode, unsigned int code)
-{
-    unsigned long align;
-
-    if (opCode)
-    {
-        align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
-        set_mem_rw(align, 1);
-        if (bytes == 1)
-        {
-            *opCode = (unsigned char)code;            
-        }
-        else
-        {
-            *(unsigned int *)opCode = code;
-        }
-        set_mem_ro(align, 1);        
-    }
-}
-
-static int notrace dmpatch_replace_code
-(
-    int style,
-    unsigned long addr, 
-    unsigned long size, 
-    int expect, 
-    const char *desc, 
-    unsigned char **patch
-)
-{
-    int i = 0;
-    int cnt = 0;
-    unsigned long align;
-    unsigned char *opCode = (unsigned char *)addr;
-
-    vdebug("patch for %s style[%d] 0x%lx %d\n", desc, style, addr, (int)size);
-
-    for (i = 0; i < (int)size - 8; i++)
-    {
-        if (style == 1)
-        {
-            if (CODE_MATCH1(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS1;
-                cnt++;
-            }
-        }
-        else if (style == 2)
-        {
-            if (CODE_MATCH2(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS2;
-                cnt++;
-            }
-        }
-        else if (style == 3)
-        {
-            if (CODE_MATCH3(opCode, i) && cnt < MAX_PATCH)
-            {
-                patch[cnt] = opCode + i + PATCH_OP_POS3;
-                cnt++;
-            }
-        }
-    }
-
-
-
-
-
-    if (cnt != expect || cnt >= MAX_PATCH)
-    {
-        vdebug("patch error: cnt=%d expect=%d\n", cnt, expect);
-        return 1;
-    }
-
-
-    for (i = 0; i < cnt; i++)
-    {
-        opCode = patch[i];
-        align = (unsigned long)opCode / g_ko_param.pgsize * g_ko_param.pgsize;
-
-        set_mem_rw(align, 1);
-        *opCode = 0;
-        set_mem_ro(align, 1);
-    }
-
-    return 0;
-}
-
-static unsigned long notrace dmpatch_find_call_offset(unsigned long addr, unsigned long size, unsigned long func)
-{
-    unsigned long i = 0;
-    unsigned long dest;
-    unsigned char *opCode = NULL;
-    unsigned char aucOffset[8] = { 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF };
-
-    opCode = (unsigned char *)addr;
-    
-    for (i = 0; i + 4 < size; i++)
-    {
-        if (opCode[i] == 0xE8)
-        {
-            aucOffset[0] = opCode[i + 1];
-            aucOffset[1] = opCode[i + 2];
-            aucOffset[2] = opCode[i + 3];
-            aucOffset[3] = opCode[i + 4];
-
-            dest = addr + i + 5 + *(unsigned long *)aucOffset;
-            if (dest == func)
-            {
-                return i;
-            }
-        }
-    }
-
-    return 0;
-}
-
-static unsigned int notrace dmpatch_patch_claim_ptr(void)
-{
-    unsigned long i = 0;
-    unsigned long t = 0;
-    unsigned long offset1 = 0;
-    unsigned long offset2 = 0;
-    unsigned long align = 0;
-    unsigned char *opCode = NULL;
-
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = 0; i < 4; i++)
-    {
-        vdebug("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
-            opCode[i + 0], opCode[i + 1], opCode[i + 2], opCode[i + 3],
-            opCode[i + 4], opCode[i + 5], opCode[i + 6], opCode[i + 7],
-            opCode[i + 8], opCode[i + 9], opCode[i + 10], opCode[i + 11],
-            opCode[i + 12], opCode[i + 13], opCode[i + 14], opCode[i + 15]);
-    }
-
-    if (dmpatch_kv_above(6, 7, 0)) /* >= 6.7 kernel */
-    {
-        vdebug("Get addr: 0x%lx %lu open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_open_addr);
-        if (offset1 == 0)
-        {
-            vdebug("call bdev_open_addr Not found\n");
-
-            vdebug("Get addr: 0x%lx %lu file_open 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.bdev_file_open_addr);
-            if (offset1 == 0)
-            {            
-                vdebug("call bdev_file_open_addr Not found\n");
-                return 1;
-            }
-        }
-    }
-    else
-    {
-        vdebug("Get addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        vdebug("Put addr: 0x%lx %lu 0x%lx\n", g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);        
-
-        offset1 = dmpatch_find_call_offset(g_ko_param.sym_get_addr, g_ko_param.sym_get_size, g_ko_param.blkdev_get_addr);
-        offset2 = dmpatch_find_call_offset(g_ko_param.sym_put_addr, g_ko_param.sym_put_size, g_ko_param.blkdev_put_addr);
-        if (offset1 == 0 || offset2 == 0)
-        {
-            vdebug("call blkdev_get or blkdev_put Not found, %lu %lu\n", offset1, offset2);
-            return 1;
-        }
-    }
-
-    
-    vdebug("call addr1:0x%lx  call addr2:0x%lx\n", 
-        g_ko_param.sym_get_addr + offset1, 
-        g_ko_param.sym_put_addr + offset2);
-    
-    opCode = (unsigned char *)g_ko_param.sym_get_addr;
-    for (i = offset1 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-    {
-        /* rdx */
-        if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc2)
-        {
-            g_claim_ptr = *(unsigned int *)(opCode + i + 3);
-            g_get_patch[0] = opCode + i + 3;
-            vdebug("claim_ptr(%08X) found at get addr 0x%lx\n", g_claim_ptr, g_ko_param.sym_get_addr + i + 3);
-            break;
-        }
-    }
-
-    if (g_claim_ptr == 0)
-    {
-        vdebug("Claim_ptr not found in get\n");
-        return 1;
-    }
-
-    
-    align = (unsigned long)g_get_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-    set_mem_rw(align, 1);
-    *(unsigned int *)(g_get_patch[0]) = 0;
-    set_mem_ro(align, 1);  
-
-
-    if (offset2 > 0)
-    {        
-        opCode = (unsigned char *)g_ko_param.sym_put_addr;
-        for (i = offset2 - 1, t = 0; (i > 0) && (t < 24); i--, t++)
-        {
-            /* rsi */
-            if (opCode[i] == 0x48 && opCode[i + 1] == 0xc7 && opCode[i + 2] == 0xc6)
-            {
-                if (*(unsigned int *)(opCode + i + 3) == g_claim_ptr)
-                {
-                    vdebug("claim_ptr found at put addr 0x%lx\n", g_ko_param.sym_put_addr + i + 3);
-                    g_put_patch[0] = opCode + i + 3;
-                    break;                
-                }
-            }
-        }    
-
-        if (g_put_patch[0] == 0)
-        {
-            vdebug("Claim_ptr not found in put\n");
-            return 1;
-        }
-        
-        align = (unsigned long)g_put_patch[0] / g_ko_param.pgsize * g_ko_param.pgsize;
-        set_mem_rw(align, 1);
-        *(unsigned int *)(g_put_patch[0]) = 0;
-        set_mem_ro(align, 1);   
-    }
-
-    return 0;
-}
-
-#ifdef VTOY_IBT
-static __always_inline unsigned long long dmpatch_rdmsr(unsigned int msr)
-{
-	DECLARE_ARGS(val, low, high);
-
-	asm volatile("1: rdmsr\n"
-		     "2:\n"
-		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_RDMSR)
-		     : EAX_EDX_RET(val, low, high) : "c" (msr));
-
-	return EAX_EDX_VAL(val, low, high);
-}
-
-static __always_inline void dmpatch_wrmsr(unsigned int msr, u32 low, u32 high)
-{
-	asm volatile("1: wrmsr\n"
-		     "2:\n"
-		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_WRMSR)
-		     : : "c" (msr), "a"(low), "d" (high) : "memory");
-}
-
-static u64 notrace dmpatch_ibt_save(void)
-{
-    u64 msr = 0;
-    u64 val = 0;
-
-    msr = dmpatch_rdmsr(MSR_IA32_S_CET);
-    val = msr & ~CET_ENDBR_EN;
-    dmpatch_wrmsr(MSR_IA32_S_CET, (u32)(val & 0xffffffffULL), (u32)(val >> 32));
-
-    return msr;
-}
-
-static void notrace dmpatch_ibt_restore(u64 save)
-{
-	u64 msr;
-
-    msr = dmpatch_rdmsr(MSR_IA32_S_CET);
-
-	msr &= ~CET_ENDBR_EN;
-	msr |= (save & CET_ENDBR_EN);
-
-    dmpatch_wrmsr(MSR_IA32_S_CET, (u32)(msr & 0xffffffffULL), (u32)(msr >> 32));
-}
-#else
-static u64 notrace dmpatch_ibt_save(void) { return 0; }
-static void notrace dmpatch_ibt_restore(u64 save) { (void)save; }
-#endif
-
-static int notrace dmpatch_process(unsigned long a, unsigned long b, unsigned long c)
-{
-    int r = 0;
-    int rc = 0;
-    unsigned long kv_major = 0;
-    unsigned long kv_minor = 0;
-    unsigned long kv_subminor = 0;
-
-    vdebug("dmpatch_process as KV %d.%d.%d ...\n", (int)a, (int)b, (int)c);
-
-    kv_major = g_ko_param.kv_major;
-    kv_minor = g_ko_param.kv_minor;
-    kv_subminor = g_ko_param.kv_subminor;
-
-    g_ko_param.kv_major = a;
-    g_ko_param.kv_minor = b;
-    g_ko_param.kv_subminor = c;
-    
-    if (dmpatch_kv_above(6, 5, 0)) /* >= kernel 6.5 */
-    {
-        vdebug("new interface patch dm_get_table_device...\n");
-        r = dmpatch_patch_claim_ptr();
-    }
-    else
-    {
-        r = dmpatch_replace_code(1, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 2, "dm_get_table_device", g_get_patch);
-        if (r && g_ko_param.kv_major >= 5)
-        {
-            vdebug("new2 patch dm_get_table_device...\n");
-            r = dmpatch_replace_code(2, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch);
-        }
-
-        if (r && g_ko_param.kv_major >= 5)
-        {
-            vdebug("new3 patch dm_get_table_device...\n");
-            r = dmpatch_replace_code(3, g_ko_param.sym_get_addr, g_ko_param.sym_get_size, 1, "dm_get_table_device", g_get_patch);
-        }
-    }
-
-    if (r)
-    {
-        rc = -EFAULT;
-        goto out;
-    }
-    vdebug("patch dm_get_table_device success\n");
-
-    if (dmpatch_kv_above(6, 5, 0))
-    {
-        r = 0;
-    }
-    else
-    {
-        r = dmpatch_replace_code(1, g_ko_param.sym_put_addr, g_ko_param.sym_put_size, 1, "dm_put_table_device", g_put_patch);        
-        if (r)
-        {
-            rc = -EFAULT;
-            goto out;
-        }
-        vdebug("patch dm_put_table_device success\n");
-    }
-
-    vdebug("#####################################\n");
-    vdebug("######## dm patch success ###########\n");
-    vdebug("#####################################\n");
-
-out:
-
-    g_ko_param.kv_major = kv_major;
-    g_ko_param.kv_minor = kv_minor;
-    g_ko_param.kv_subminor = kv_subminor;
-
-	return rc;
-}
-
-static int notrace dmpatch_init(void)
-{
-    int rc = 0;
-    u64 msr = 0;
-    
-    if (g_ko_param.ibt == 0x8888)
-    {
-        msr = dmpatch_ibt_save();
-    }
-    
-    kprintf = (printk_pf)(g_ko_param.printk_addr); 
-
-    vdebug("dmpatch_init start pagesize=%lu kernel=%lu.%lu.%lu ...\n", 
-        g_ko_param.pgsize, g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
-    
-    if (g_ko_param.struct_size != sizeof(ko_param))
-    {
-        vdebug("Invalid struct size %d %d\n", (int)g_ko_param.struct_size, (int)sizeof(ko_param));
-        return -EINVAL;
-    }
-    
-    if (g_ko_param.sym_get_addr == 0 || g_ko_param.sym_put_addr == 0 || 
-        g_ko_param.ro_addr == 0 || g_ko_param.rw_addr == 0)
-    {
-        return -EINVAL;
-    }
-
-    set_mem_ro = (set_memory_attr_pf)(g_ko_param.ro_addr);
-    set_mem_rw = (set_memory_attr_pf)(g_ko_param.rw_addr);
-    reg_kprobe = (kprobe_reg_pf)g_ko_param.reg_kprobe_addr;
-    unreg_kprobe = (kprobe_unreg_pf)g_ko_param.unreg_kprobe_addr;
-
-    rc = dmpatch_process(g_ko_param.kv_major, g_ko_param.kv_minor, g_ko_param.kv_subminor);
-    if (rc)
-    {
-        if (g_ko_param.kv_major >= 5)
-        {
-            rc = dmpatch_process(6, 5, 0);
-            if (rc)
-            {
-                rc = dmpatch_process(6, 7, 0);
-            }
-        }
-    }
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        dmpatch_ibt_restore(msr);
-    }
-
-    return rc;
-}
-
-static void notrace dmpatch_exit(void)
-{
-    int i = 0;
-    u64 msr;
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        msr = dmpatch_ibt_save();
-    }
-
-    if (g_claim_ptr)
-    {
-        dmpatch_restore_code(4, g_get_patch[0], g_claim_ptr);
-        if (g_put_patch[0])
-        {
-            dmpatch_restore_code(4, g_put_patch[0], g_claim_ptr);
-        }
-    }
-    else
-    {        
-        for (i = 0; i < MAX_PATCH; i++)
-        {
-            dmpatch_restore_code(1, g_get_patch[i], 0x80);
-            dmpatch_restore_code(1, g_put_patch[i], 0x80);
-        }
-    }
-
-    vdebug("dmpatch_exit success\n");
-
-    if (g_ko_param.ibt == 0x8888)
-    {
-        dmpatch_ibt_restore(msr);
-    }
-}
-
-module_init(dmpatch_init);
-module_exit(dmpatch_exit);
-
-
-MODULE_DESCRIPTION("dmpatch driver");
-MODULE_AUTHOR("longpanda <admin@ventoy.net>");
-MODULE_LICENSE("GPL");
-
--- a/DMPATCH/readme.txt
+++ b/DMPATCH/readme.txt
@ -1,38 +0,0 @@
-1. install ubuntu 22.04  5.15.0-25
-2. apt-get install build-essential flex libncurses-dev linux-headers-generic linux-source libssl-dev bison yacc vim libelf-dev  ...... and so on
-3. cp /lib/modules/5.15.0-25-generic/build/Module.symvers ./
-4. /boot/config-5.15.0-25-generic as .config   make oldconfig
-5. make menuconfig 
-    1. close CONFIG_STACKPROTECTOR
-    2. close CONFIG_RETPOLINE
-    3. close CONFIG_UBSAN_BOUNDS
-    4. close CONFIG_UBSAN_ENUM
-
-6. modify ./scripts/mod/modpost.c
-    1. skip add_srcversion (just return)
-    2. force add_retpoline (#ifdef --> #ifndef)
-    3. force add_intree_flag
-
-7. make modules_prepare LOCALVERSION=-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-8. Append padding at the end of struct module <include/linux/module.h>
-struct module {
-    enum module_state state;
-
-	/* Member of list of modules */
-	struct list_head list;
-
-	/* Unique handle for this module */
-	char name[MODULE_NAME_LEN];
-    
-    ....
-    
-    char padding[1024];
-};
-
-This is because struct module size is different in different kernel versions or with different CONFIG item.
-
-
-9. make modules M=/home/dmpatch
-10. strip --strip-debug /home/dmpatch/dm_patch.ko
-
--- a/DMPATCH/ubuntu_build.sh
+++ b/DMPATCH/ubuntu_build.sh
@ -1,65 +0,0 @@
-#!/bin/bash
-
-FTPIP=192.168.44.1
-FTPUSR='a:a'
-
-rm -f dmpatch.c Makefile Makefile_IBT
-
-for f in dmpatch.c Makefile Makefile_IBT; do
-	curl -s -u $FTPUSR ftp://$FTPIP/$f -o $f
-	if [ -f $f ]; then
-		echo "download $f OK ..."
-	else
-		echo "download $f FAILED ..."
-		exit 1
-	fi
-done
-
-
-
-rm -f *.ko
-
-
-echo "build dm_patch.ko ..."
-rm -rf ./aa
-mkdir ./aa
-
-cp -a *.c aa/
-cp -a Makefile aa/
-
-cd /home/panda/linux-source-5.15.0
-make modules M=/home/panda/build/aa/
-strip --strip-debug /home/panda/build/aa/dm_patch.ko
-cd -
-
-cp -a aa/dm_patch.ko  ./
-
-
-
-echo "build dm_patch_ibt.ko ..."
-rm -rf ./aa
-mkdir ./aa
-
-cp -a *.c aa/
-cp -a Makefile_IBT aa/Makefile
-
-cd /home/panda/linux-source-5.15.0
-make modules M=/home/panda/build/aa/
-strip --strip-debug /home/panda/build/aa/dm_patch_ibt.ko
-cd -
-
-cp -a aa/dm_patch_ibt.ko ./
-
-rm -rf ./aa
-
-
-curl -s -T dm_patch.ko -u $FTPUSR ftp://$FTPIP/dm_patch_64.ko || exit 1
-curl -s -T dm_patch_ibt.ko -u $FTPUSR ftp://$FTPIP/dm_patch_ibt_64.ko || exit 1
-
-
-if [ -f ./dm_patch.ko -a -f ./dm_patch_ibt.ko ]; then
-	echo -e "\n\n=============== SUCCESS =============\n\n"
-else
-	echo -e "\n\n=============== FAILED ==============\n\n"
-fi
-
--- a/DMSETUP/build.txt
+++ b/DMSETUP/build.txt
@ -5,7 +5,7 @@ use an old version of dmsetup
 http://vault.centos.org/5.3/os/SRPMS/device-mapper-1.02.28-2.el5.src.rpm
 https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz

-======== Build Environment ======== 
+======== Build Envrioment ======== 
 build for 32bit, static linked with dietlibc
 1. install centos 6.10 i386 with CentOS-6.10-i386-bin-DVD1.iso
 2. yum install gcc kernel-devel package
--- a/DOC/BuildVentoyFromSource.txt
+++ b/DOC/BuildVentoyFromSource.txt
@ -1,9 +1,9 @@

 ==========================================
-1. Compile Environment
+1. Compile Enviroment
 ==========================================
-    My build environment is CentOS 7.8 x86_64. So here I first explain how to create the build environment from scratch.
-    Ventoy is based on many open source projects, so the build environment is important. I suggest you first test it on a virtual machine.
+    My build envrioment is CentOS 7.8 x86_64. So here I first explain how to create the build environment from scratch.
+    Because Ventoy is based on many open source projects, so the environment is important. I suggest you test it on a virtual machine firstly.

 1.1 Install CentOS 7.8
    I use CentOS-7-x86_64-Everything-2003.iso and select Minimal install
@ -21,10 +21,10 @@
 ==========================================
 2. Download Source Code
 ==========================================
-2.1 Download Ventoy source code from GitHub and decompress it. 
+2.1 Download Ventoy source code from github and decompress it. 
    Next I assume that you have unzipped the code into the /home directory (check /home/Ventoy-master/README.md file for the directory layout).
    
-2.2 Download third-party source code and tool
+2.2 Download third-part source code and tool
    
    https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz                    ===>  /home/Ventoy-master/DOC/dietlibc-0.34.tar.xz
    https://musl.libc.org/releases/musl-1.2.1.tar.gz                     ===>  /home/Ventoy-master/DOC/musl-1.2.1.tar.gz
@ -34,7 +34,7 @@
    https://codeload.github.com/libfuse/libfuse/zip/fuse-2.9.9           ===>  /home/Ventoy-master/ExFAT/libfuse-fuse-2.9.9.zip
    https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz           ===>  /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz
    https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2
-    https://github.com/ventoy/vtoytoolchain/releases/download/1.0/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
+    http://ftp.loongnix.org/toolchain/gcc/release/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz ===> /opt/mips-loongson-gcc7.3-2019.06-29-linux-gnu.tar.gz
    https://github.com/ventoy/musl-cross-make/releases/download/latest/output.tar.bz2 ===> /opt/output.tar.bz2


@ -42,7 +42,7 @@
    http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/corepure64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/corepure64.gz
    http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/modules64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/modules64.gz    

-2.3 Prepare third-party tools
+2.3 Prepare third-part tools
    cd /home/Ventoy-master/DOC/
    tar xf musl-1.2.1.tar.gz
    cd musl-1.2.1
@ -54,7 +54,7 @@
    mv /opt/output /opt/mips64el-linux-musl-gcc730
    

-2.4 Set PATH environment
+2.4 Set PATH envrioment
    export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin:/opt/mips64el-linux-musl-gcc730/bin
    better to add this line to /root/.bashrc and relogin as root

@ -62,21 +62,21 @@
 ==========================================
 3. All in one script
 ==========================================
-    I have made an all-in-one script `all_in_one.sh`. You can run this script to build and pack ventoy.
+    I have made a all_in_one.sh, you can run this script to build and pack ventoy.
    If you want to compile a certain part separately, you can continue to refer to the later chapters of this text.
    
    cd /home/Ventoy-master/INSTALL
    sh all_in_one.sh

    It should be noted that:
-    1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other parts contain binaries and are rarely modified, so will not be recompiled everytime.
+    1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other part contains the binaries and are few modified, so will no be recompiled everytime.
       You can rebuild these parts separately if you want.
       
-    2. Some parts of Ventoy have a 32-bit and 64-bit version (like 4.9, 4.10, 4.11 follows)
-       all_in_one.sh only builds the 64bit version of them. If you want to rebuild the 32bit verison, you should create a 32-bit CentOS environment and build them.
-       Fortunately these parts are rarely modified, so you only need to build once or you can directly use the binaries I have built.
+    2. some part of Ventoy has 32bit&64bit version (like 4.9 4.10 4.11 follows)
+       all_in_one.sh only build 64bit version of them, if you want to rebuild the 32bit verison. You should create a 32bit CentOS environment and build them.
+       Fortunately these parts are few modified, you only need to build once or you can directly use the binary I have built.

-    Besides, after a full compile and packaging, you can only build the part you modified (for example grub2) and run ventoy_pack.sh to generate the package.
+    Besides, after a fully compile and pack, you can only build the part you modified (for example grub2) and run ventoy_pack.sh to generate the package.

 ==========================================
 4. Build every part of Ventoy
@ -108,10 +108,10 @@
    cd /home/Ventoy-master/VtoyTool
    sh build.sh

-4.8 == Build vtoycli ==    
-    cd /home/Ventoy-master/vtoycli/fat_io_lib
+4.8 == Build vtoyfat ==    
+    cd /home/Ventoy-master/vtoyfat/fat_io_lib
    sh buildlib.sh
-    cd /home/Ventoy-master/vtoycli
+    cd /home/Ventoy-master/vtoyfat
    sh build.sh

 4.9 == Build exfat-util ==
@ -122,14 +122,14 @@
    After that, copy EXFAT/shared/mkexfatfs         ===> /home/Ventoy-master/INSTALL/tool/mkexfatfs_64
    After that, copy EXFAT/shared/mount.exfat-fuse  ===> /home/Ventoy-master/INSTALL/tool/mount.exfat-fuse_64

-    Use the same build step to build exfat-util 32-bit in a 32-bit CentOS system and get mkexfatfs_32 and mount.exfat-fuse_32
+    Use the same build step to build exfat-util 32bit in a 32bit CentOS system and get mkexfatfs_32 and mount.exfat-fuse_32

 4.10 == Build vtoy_fuse_iso_64/vtoy_fuse_iso_32 ==
    cd /home/Ventoy-master/FUSEISO
    sh build_libfuse.sh
    sh build.sh
    
-    Use the same build step to build in a 32-bit CentOS system and get vtoy_fuse_iso_32
+    Use the same build step to build in a 32bit CentOS system and get vtoy_fuse_iso_32
   
 4.11 == Build unsquashfs_64/unsquashfs_32 ==
    cd /home/Ventoy-master/SQUASHFS/SRC
@ -141,7 +141,7 @@
    cd /home/Ventoy-master/SQUASHFS/squashfs-tools-4.4/squashfs-tools
    sh build.sh
    
-    Use the same build step to build in a 32-bit CentOS system and get unsquashfs_32
+    Use the same build step to build in a 32bit CentOS system and get unsquashfs_32
   
 4.12 == Build vblade_64/vblade_32 ==
    cd /home/Ventoy-master/VBLADE/vblade-master
@ -159,12 +159,12 @@
   make -f ventoy_makefile
   strip --strip-all xzminidec

-4.16 == Build xzminidec64/xzminidec64_musl ==
+4.16 == Build xzminidec64 ==
   cd /home/Ventoy-master/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/userspace
-   make -f ventoy_makefile64 or make -f ventoy_makefile64_musl
+   make -f ventoy_makefile64
   strip --strip-all xzminidec

-4.17 == Build iso9660_x64.efi/udf_x64.efi/iso9660_ia32.efi/udf_ia32.efi/iso9660_aa64.efi/udf_aa64.efi/ ==
+4.17 == Build iso9660_x64.efi ==
   This efi driver is from https://github.com/pbatard/efifs
   Follow all the build instructions in this project. I modified 3 files (the original and modified source are at /home/Ventoy-master/EDK2/efiffs)

@ -185,16 +185,6 @@
  make
  aarch64-buildroot-linux-uclibc-strip --strip-all lunzip

-4.17 == Build xzminidecaa64 ==
-   cd /home/Ventoy-master/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/userspace
-   make -f ventoy_makefileaa64
-   strip --strip-all xzminidec
-
-4.18 == Build xzminidecm64e ==
-   cd /home/Ventoy-master/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/userspace
-   make -f ventoy_makefilem64e
-   strip --strip-all xzminidec
-


 ==========================================
@ -266,11 +256,5 @@
 ISNTALL/ventoy/7z/64/7za.exe  SHA-256: 8117e40ee7f824f63373a4f5625bb62749f69159d0c449b3ce2f35aad3b83549
 ISNTALL/ventoy/7z/32/7za.exe  SHA-256: ea308c76a2f927b160a143d94072b0dce232e04b751f0c6432a94e05164e716d
 
-5.13 ./Ventoy/Unix/ventoy_unix/DragonFly/sbin/dmsetup
- download from https://cdimage.debian.org/mirror/dragonflybsd.org/iso-images/dfly-x86_64-5.8.3_REL.iso.bz2
- extract from the ISO file  sbin/dmsetup
- dmsetup  SHA-256: bedcf26650e87edfe961e33bae20d832bce73efd4b6239f9a6a5785661e4e698

-5.14 ./LiveCD/ISO/EFI/boot/vmlinuz64
- download from http://www.tinycorelinux.net/11.x/x86_64/archive/11.0/distribution_files/vmlinuz64    
- vmlinuz64  SHA-256: 641077fc1f9914af244c248453005f56536ba9e7f54ba3e52402f26709ddb8a5
+
--- a/9
+++ b/9
@ -1,15 +1,10 @@
 FROM centos:7

-RUN sed -i \
-    -e 's/^mirrorlist/#mirrorlist/' \
-    -e 's/^#baseurl/baseurl/' \
-    -e 's/mirror\.centos\.org/vault.centos.org/' \
-    /etc/yum.repos.d/*.repo && \
-    yum -y -q install \
+RUN yum -y -q install \
        libXpm net-tools bzip2 wget vim gcc gcc-c++ samba dos2unix glibc-devel glibc.i686 glibc-devel.i686 \
        mpfr.i686 mpfr-devel.i686 rsync autogen autoconf automake libtool gettext* bison binutils \
        flex device-mapper-devel SDL libpciaccess libusb freetype freetype-devel gnu-free-* qemu-* virt-* \
        libvirt* vte* NetworkManager-bluetooth brlapi fuse-devel dejavu* gnu-efi* pesign shim \
-        iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static xorriso lz4 squashfs-tools
+        iscsi-initiator-utils grub2-tools zip nasm acpica-tools glibc-static zlib-static xorriso

 CMD cd /ventoy/INSTALL && ls -la && sh docker_ci_build.sh    
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VDiskChain/VDiskChain.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VDiskChain/VDiskChain.c
@ -249,12 +249,6 @@ EFI_STATUS EFIAPI vdisk_exit_boot_service_wrapper
    IN  UINTN                        MapKey
 )
 {
-    if (g_org_get_variable)
-    {
-        gRT->GetVariable = g_org_get_variable;
-        g_org_get_variable = NULL;
-    }
-
    return g_org_exit_boot_service(ImageHandle, MapKey);
 }

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
@ -34,7 +34,6 @@
 #include <Protocol/BlockIo.h>
 #include <Protocol/RamDisk.h>
 #include <Protocol/SimpleFileSystem.h>
-#include <Protocol/DriverBinding.h>
 #include <Ventoy.h>

 BOOLEAN gDebugPrint = FALSE;
@ -59,9 +58,6 @@ static grub_env_set_pf grub_env_set = NULL;
 ventoy_grub_param_file_replace *g_file_replace_list = NULL;
 ventoy_efi_file_replace g_efi_file_replace;

-ventoy_grub_param_file_replace *g_img_replace_list = NULL;
-ventoy_efi_file_replace g_img_file_replace[VTOY_MAX_CONF_REPLACE];
-
 CONST CHAR16 gIso9660EfiDriverPath[] = ISO9660_EFI_DRIVER_PATH;
 CONST CHAR16 gUdfEfiDriverPath[] = UDF_EFI_DRIVER_PATH;

@ -71,9 +67,6 @@ STATIC BOOLEAN g_hook_keyboard = FALSE;

 CHAR16 gFirstTryBootFile[256] = {0};

-STATIC EFI_GET_VARIABLE g_org_get_variable = NULL;
-STATIC EFI_EXIT_BOOT_SERVICES g_org_exit_boot_service = NULL;
-
 /* Boot filename */
 UINTN gBootFileStartIndex = 1;
 CONST CHAR16 *gEfiBootFileName[] = 
@ -229,14 +222,12 @@ static void EFIAPI ventoy_dump_chain(ventoy_chain_head *chain)
    debug("os_param->vtoy_img_size=<%llu>",    chain->os_param.vtoy_img_size);
    debug("os_param->vtoy_img_location_addr=<0x%llx>", chain->os_param.vtoy_img_location_addr);
    debug("os_param->vtoy_img_location_len=<%u>",    chain->os_param.vtoy_img_location_len);
-    debug("os_param->vtoy_reserved=<%u %u %u %u %u %u %u>",    
+    debug("os_param->vtoy_reserved=<%u %u %u %u %u>",    
          g_os_param_reserved[0], 
          g_os_param_reserved[1], 
          g_os_param_reserved[2], 
          g_os_param_reserved[3],
-          g_os_param_reserved[4],
-          g_os_param_reserved[5],
-          g_os_param_reserved[6]
+          g_os_param_reserved[4]
          );

    ventoy_debug_pause();
@ -371,22 +362,10 @@ EFI_HANDLE EFIAPI ventoy_get_parent_handle(IN EFI_DEVICE_PATH_PROTOCOL *pDevPath
    return Handle;
 }

-STATIC ventoy_ram_disk g_backup_ramdisk_param;
-STATIC ventoy_os_param g_backup_os_param_var;
-
-
 EFI_STATUS EFIAPI ventoy_save_ramdisk_param(VOID)
 {
-    UINTN DataSize;
    EFI_STATUS Status = EFI_SUCCESS;
    EFI_GUID VarGuid = VENTOY_GUID;
-
-    DataSize = sizeof(g_backup_ramdisk_param);
-    Status = gRT->GetVariable(L"VentoyRamDisk", &VarGuid, NULL, &DataSize, &g_backup_ramdisk_param);
-    if (!EFI_ERROR(Status))
-    {
-        debug("find previous ramdisk variable <%llu>", g_backup_ramdisk_param.DiskSize);
-    }
    
    Status = gRT->SetVariable(L"VentoyRamDisk", &VarGuid, 
                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@ -400,38 +379,21 @@ EFI_STATUS EFIAPI ventoy_delete_ramdisk_param(VOID)
 {
    EFI_STATUS Status = EFI_SUCCESS;
    EFI_GUID VarGuid = VENTOY_GUID;
-
-    if (g_backup_ramdisk_param.DiskSize > 0 && g_backup_ramdisk_param.PhyAddr > 0)
-    {
-        Status = gRT->SetVariable(L"VentoyRamDisk", &VarGuid, 
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                  sizeof(g_backup_ramdisk_param), &g_backup_ramdisk_param);
-        debug("resotre ramdisk variable %r", Status);
-    }
-    else
-    {
-        Status = gRT->SetVariable(L"VentoyRamDisk", &VarGuid, 
+    
+    Status = gRT->SetVariable(L"VentoyRamDisk", &VarGuid, 
                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
                  0, NULL);
-        debug("delete ramdisk variable %r", Status);
-    }
+    debug("delete efi variable %r", Status);

    return Status;
 }

+
 EFI_STATUS EFIAPI ventoy_save_variable(VOID)
 {
-    UINTN DataSize;
    EFI_STATUS Status = EFI_SUCCESS;
    EFI_GUID VarGuid = VENTOY_GUID;
-
-    DataSize = sizeof(g_backup_os_param_var);
-    Status = gRT->GetVariable(L"VentoyOsParam", &VarGuid, NULL, &DataSize, &g_backup_os_param_var);
-    if (!EFI_ERROR(Status))
-    {
-        debug("find previous efi variable <%a>", g_backup_os_param_var.vtoy_img_path);
-    }
-
+    
    Status = gRT->SetVariable(L"VentoyOsParam", &VarGuid, 
                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
                  sizeof(g_chain->os_param), &(g_chain->os_param));
@ -444,21 +406,11 @@ EFI_STATUS EFIAPI ventoy_delete_variable(VOID)
 {
    EFI_STATUS Status = EFI_SUCCESS;
    EFI_GUID VarGuid = VENTOY_GUID;
-
-    if (0 == CompareMem(&(g_backup_os_param_var.guid), &VarGuid, sizeof(EFI_GUID)))
-    {
-        Status = gRT->SetVariable(L"VentoyOsParam", &VarGuid, 
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
-                  sizeof(g_backup_os_param_var), &(g_backup_os_param_var));
-        debug("restore efi variable %r", Status);
-    }
-    else
-    {
-        Status = gRT->SetVariable(L"VentoyOsParam", &VarGuid, 
+    
+    Status = gRT->SetVariable(L"VentoyOsParam", &VarGuid, 
                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
                  0, NULL);
-        debug("delete efi variable %r", Status);
-    }
+    debug("delete efi variable %r", Status);

    return Status;
 }
@ -577,11 +529,10 @@ STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk(IN EFI_HANDLE ImageHandle)
            continue;
        }

-        if (CompareMem(g_chain->os_param.vtoy_disk_guid, pBuffer + 0x180, 16) == 0 &&
-            CompareMem(g_chain->os_param.vtoy_disk_signature, pBuffer + 0x1b8, 4) == 0)
+        if (CompareMem(g_chain->os_param.vtoy_disk_guid, pBuffer + 0x180, 16) == 0)
        {
            pMBR = (MBR_HEAD *)pBuffer;
-            if (g_os_param_reserved[6] == 0 && pMBR->PartTbl[0].FsFlag != 0xEE)
+            if (pMBR->PartTbl[0].FsFlag != 0xEE)
            {
                if (pMBR->PartTbl[0].StartSectorId != 2048 ||
                    pMBR->PartTbl[1].SectorCount != 65536 ||
@ -600,7 +551,7 @@ STATIC EFI_STATUS EFIAPI ventoy_find_iso_disk(IN EFI_HANDLE ImageHandle)
                              Handles[i],
                              EFI_OPEN_PROTOCOL_GET_PROTOCOL);
            
-            debug("Find Ventoy Disk Sig Handle:%p DP:%s", Handles[i], 
+            debug("Find Ventoy Disk Handle:%p DP:%s", Handles[i], 
                ConvertDevicePathToText(gBlockData.pDiskDevPath, FALSE, FALSE));
            break;
        }
@ -716,106 +667,6 @@ STATIC EFI_STATUS EFIAPI ventoy_load_isoefi_driver(IN EFI_HANDLE ImageHandle)
    return EFI_SUCCESS;
 }

-STATIC EFI_STATUS ventoy_proc_img_replace_name(ventoy_grub_param_file_replace *replace)
-{
-    UINT32 i;
-    char tmp[256];
-
-    if (replace->magic != GRUB_IMG_REPLACE_MAGIC)
-    {
-        return EFI_SUCCESS;
-    }
-
-    if (replace->old_file_name[0][0] == 0)
-    {
-        return EFI_SUCCESS;
-    }
-
-    AsciiStrCpyS(tmp, sizeof(tmp), replace->old_file_name[0]);
-    
-    for (i = 0; i < 256 && tmp[i]; i++)
-    {
-        if (tmp[i] == '/')
-        {
-            tmp[i] = '\\';
-        }
-    }
-
-    AsciiStrCpyS(replace->old_file_name[0], 256, tmp);
-    return EFI_SUCCESS;
-}
-
-EFI_STATUS EFIAPI ventoy_get_variable_wrapper
-(
-    IN     CHAR16                      *VariableName,
-    IN     EFI_GUID                    *VendorGuid,
-    OUT    UINT32                      *Attributes,    OPTIONAL
-    IN OUT UINTN                       *DataSize,
-    OUT    VOID                        *Data           OPTIONAL
-)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    
-    Status = g_org_get_variable(VariableName, VendorGuid, Attributes, DataSize, Data);
-    if (StrCmp(VariableName, L"SecureBoot") == 0)
-    {
-        if ((*DataSize == 1) && Data)
-        {
-            *(UINT8 *)Data = 0;
-        }
-    }
-
-    return Status;
-}
-
-EFI_STATUS EFIAPI ventoy_exit_boot_service_wrapper
-(
-    IN  EFI_HANDLE                   ImageHandle,
-    IN  UINTN                        MapKey
-)
-{
-    if (g_org_get_variable)
-    {
-        gRT->GetVariable = g_org_get_variable;
-        g_org_get_variable = NULL;
-    }
-    
-    return g_org_exit_boot_service(ImageHandle, MapKey);
-}
-
-STATIC EFI_STATUS EFIAPI ventoy_disable_secure_boot(IN EFI_HANDLE ImageHandle)
-{
-    UINT8 Value = 0;
-    UINTN DataSize = 1;
-    EFI_STATUS Status = EFI_SUCCESS;
-
-    Status = gRT->GetVariable(L"SecureBoot", &gEfiGlobalVariableGuid, NULL, &DataSize, &Value);
-    if (!EFI_ERROR(Status))
-    {
-        if (DataSize == 1 && Value == 0)
-        {
-            debug("Current secure boot is off, no need to disable");
-            return EFI_SUCCESS;
-        }
-    }
-
-    debug("ventoy_disable_secure_boot");
-
-    /* step1: wrapper security protocol. */
-    /* Do we still need it since we have been loaded ? */
-    
-    
-    /* step2: fake SecureBoot variable */
-    g_org_exit_boot_service = gBS->ExitBootServices;
-    gBS->ExitBootServices = ventoy_exit_boot_service_wrapper;
-    
-    g_org_get_variable = gRT->GetVariable;
-    gRT->GetVariable = ventoy_get_variable_wrapper;
-
-    return EFI_SUCCESS;
-}
-
-
 STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
 {   
    UINT32 i = 0;
@ -829,7 +680,6 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
    ventoy_grub_param *pGrubParam = NULL;
    EFI_LOADED_IMAGE_PROTOCOL *pImageInfo = NULL;
    ventoy_chain_head *chain = NULL;
-    ventoy_grub_param_file_replace *replace = NULL;

    Status = gBS->HandleProtocol(ImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **)&pImageInfo);
    if (EFI_ERROR(Status))
@ -927,28 +777,6 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
        old_cnt > 3 ? g_file_replace_list->old_file_name[3] : ""
        );

-    
-    for (i = 0; i < VTOY_MAX_CONF_REPLACE; i++)
-    {
-        replace = pGrubParam->img_replace + i;
-        if (replace->magic == GRUB_IMG_REPLACE_MAGIC)
-        {
-            ventoy_proc_img_replace_name(replace);
-            old_cnt = replace->old_file_cnt;
-            debug("img replace[%d]: magic:0x%x virtid:%u name count:%u <%a> <%a> <%a> <%a>",
-                  i, replace->magic,
-                  replace->new_file_virtual_id,
-                  old_cnt,
-                  old_cnt > 0 ? replace->old_file_name[0] : "",
-                  old_cnt > 1 ? replace->old_file_name[1] : "",
-                  old_cnt > 2 ? replace->old_file_name[2] : "",
-                  old_cnt > 3 ? replace->old_file_name[3] : ""
-                  );
-            g_img_replace_list = pGrubParam->img_replace;
-        }
-    }
-
-    
    pPos = StrStr(pCmdLine, L"mem:");
    chain = (ventoy_chain_head *)StrHexToUintn(pPos + 4);

@ -969,7 +797,6 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
        debug("memdisk mode iso_buf_size:%u", g_iso_buf_size);

        g_chain = chain;
-        g_os_param_reserved = (UINT8 *)(g_chain->os_param.vtoy_reserved);
        gMemdiskMode = TRUE;
    }
    else
@ -997,11 +824,6 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
        {
            g_hook_keyboard = TRUE;
        }
-        
-        if (g_os_param_reserved[5] == 1 && g_os_param_reserved[2] == ventoy_chain_linux)
-        {
-            ventoy_disable_secure_boot(ImageHandle);
-        }

        debug("internal param: secover:%u keyboard:%u", g_fixup_iso9660_secover_enable, g_hook_keyboard);

@ -1188,7 +1010,7 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
                gST->ConIn->Reset(gST->ConIn, FALSE);
            }
            
-            if ((g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC) || g_img_replace_list)
+            if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC)
            {
                ventoy_wrapper_push_openvolume(pFile->OpenVolume);
                pFile->OpenVolume = ventoy_wrapper_open_volume;
@ -1263,8 +1085,6 @@ EFI_STATUS EFIAPI VentoyEfiMain
        return Status;
    }

-    ventoy_disable_ex_filesystem();
-
    if (gMemdiskMode)
    {
        g_ramdisk_param.PhyAddr = (UINT64)(UINTN)g_iso_data_buf;
@ -1339,8 +1159,6 @@ EFI_STATUS EFIAPI VentoyEfiMain
        grub_env_set("vtoy_dotefi_retry", "YES");            
    }

-    ventoy_enable_ex_filesystem();
-
    return EFI_SUCCESS;
 }

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
@ -98,9 +98,7 @@ typedef struct ventoy_os_param
    
    UINT64  vtoy_reserved[4];     // Internal use by ventoy

-    UINT8   vtoy_disk_signature[4];
-
-    UINT8   reserved[27];
+    UINT8   reserved[31];
 }ventoy_os_param;

 #pragma pack()
@ -171,6 +169,7 @@ typedef struct ventoy_virt_chunk
 	{ 0x37b87ac6, 0xc180, 0x4583, { 0xa7, 0x05, 0x41, 0x4d, 0xa8, 0xf7, 0x7e, 0xd2 }}


+#define VTOY_BLOCK_DEVICE_PATH_NAME  L"ventoy"

 #if   defined (MDE_CPU_IA32)
  #define VENTOY_UEFI_DESC   L"IA32 UEFI"
@ -244,9 +243,7 @@ typedef int (*grub_env_printf_pf)(const char *fmt, ...);

 #pragma pack(1)

-#define VTOY_MAX_CONF_REPLACE    2
 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
-#define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF

 typedef struct ventoy_efi_file_replace
 {
@ -271,7 +268,6 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
    grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;

@ -348,14 +344,6 @@ typedef struct ventoy_system_wrapper
    EFI_LOCATE_DEVICE_PATH OriLocateDevicePath;
 } ventoy_system_wrapper;

-
-#define MAX_DRIVER_BIND_WRAPPER  64
-typedef struct DriverBindWrapper
-{
-    EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
-    EFI_DRIVER_BINDING_SUPPORTED pfOldSupport;
-}DRIVER_BIND_WRAPPER;
-
 #define ventoy_wrapper(bs, wrapper, func, newfunc) \
 {\
    wrapper.Ori##func = bs->func;\
@ -363,22 +351,6 @@ typedef struct DriverBindWrapper
    bs->func = wrapper.New##func;\
 }

-
-#define VENTOY_GET_COMPONENT_NAME(Protocol, DriverName) \
-{\
-    DriverName = NULL;\
-    Status = Protocol->GetDriverName(Protocol, "en", &DriverName);\
-    if (EFI_ERROR(Status) || NULL == DriverName) \
-    {\
-        DriverName = NULL;\
-        Status = Protocol->GetDriverName(Protocol, "eng", &DriverName);\
-        if (EFI_ERROR(Status) || NULL == DriverName) \
-        {\
-            continue;\
-        }\
-    }\
-}
-
 extern BOOLEAN gDebugPrint;
 VOID EFIAPI VtoyDebug(IN CONST CHAR8  *Format, ...);
 EFI_STATUS EFIAPI ventoy_wrapper_system(VOID);
@ -401,7 +373,6 @@ extern ventoy_virt_chunk *g_virt_chunk;
 extern UINT32 g_virt_chunk_num;
 extern vtoy_block_data gBlockData;
 extern ventoy_efi_file_replace g_efi_file_replace;
-extern ventoy_efi_file_replace g_img_file_replace[VTOY_MAX_CONF_REPLACE];
 extern ventoy_sector_flag *g_sector_flag;
 extern UINT32 g_sector_flag_num;
 extern BOOLEAN gMemdiskMode;
@ -409,7 +380,6 @@ extern BOOLEAN gSector512Mode;
 extern UINTN g_iso_buf_size;
 extern UINT8 *g_iso_data_buf;
 extern ventoy_grub_param_file_replace *g_file_replace_list;
-extern ventoy_grub_param_file_replace *g_img_replace_list;
 extern BOOLEAN g_fixup_iso9660_secover_enable;
 extern EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *g_con_simple_input_ex;
 extern BOOLEAN g_fix_windows_1st_cdrom_issue;
@ -426,8 +396,6 @@ EFI_STATUS ventoy_hook_keyboard_stop(VOID);
 BOOLEAN ventoy_is_cdrom_dp_exist(VOID);
 EFI_STATUS ventoy_hook_1st_cdrom_start(VOID);
 EFI_STATUS ventoy_hook_1st_cdrom_stop(VOID);
-EFI_STATUS ventoy_disable_ex_filesystem(VOID);
-EFI_STATUS ventoy_enable_ex_filesystem(VOID);

 #endif

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.inf
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.inf
@ -42,7 +42,6 @@
  DebugLib

 [Guids]
-  gEfiGlobalVariableGuid
  gShellVariableGuid
  gEfiVirtualCdGuid
  gEfiFileInfoGuid
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyDebug.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyDebug.c
@ -34,7 +34,6 @@
 #include <Protocol/BlockIo.h>
 #include <Protocol/RamDisk.h>
 #include <Protocol/SimpleFileSystem.h>
-#include <Protocol/DriverBinding.h>
 #include <Ventoy.h>

 #define PROCOTOL_SLEEP_MSECONDS  0
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
@ -34,7 +34,6 @@
 #include <Protocol/BlockIo.h>
 #include <Protocol/RamDisk.h>
 #include <Protocol/SimpleFileSystem.h>
-#include <Protocol/DriverBinding.h>
 #include <Ventoy.h>

 UINT8 *g_iso_data_buf = NULL;
@ -74,9 +73,6 @@ STATIC UINT8 g_sector_buf[2048];
 STATIC EFI_BLOCK_READ g_sector_2048_read = NULL;
 STATIC EFI_BLOCK_WRITE g_sector_2048_write = NULL;

-STATIC UINTN g_DriverBindWrapperCnt = 0;
-STATIC DRIVER_BIND_WRAPPER g_DriverBindWrapperList[MAX_DRIVER_BIND_WRAPPER];
-
 BOOLEAN ventoy_is_cdrom_dp_exist(VOID)
 {
    UINTN i = 0;
@ -152,8 +148,7 @@ STATIC EFI_STATUS EFIAPI ventoy_read_iso_sector
    ventoy_override_chunk *pOverride = g_override_chunk;
    EFI_BLOCK_IO_PROTOCOL *pRawBlockIo = gBlockData.pRawBlockIo;
    
-    debug("read iso sector %lu count %u Buffer:%p Align:%u blk:%u", 
-        Sector, Count, Buffer, pRawBlockIo->Media->IoAlign, pRawBlockIo->Media->BlockSize);
+    debug("read iso sector %lu count %u Buffer:%p Align:%u", Sector, Count, Buffer, pRawBlockIo->Media->IoAlign);

    ReadStart = Sector * 2048;
    ReadEnd = (Sector + Count) * 2048;
@ -488,8 +483,6 @@ EFI_STATUS EFIAPI ventoy_block_io_read_real
        secNum = VirtSec - Lba;
    }

-    debug("XXX block_io_read_real sector:%u count:%u Buffer:%p", (UINT32)Lba, (UINT32)BufferSize / 2048, Buffer);
-
    if (secNum > g_sector_flag_num)
    {
        cur_flag = AllocatePool(secNum * sizeof(ventoy_sector_flag));
@ -625,74 +618,26 @@ EFI_STATUS EFIAPI ventoy_block_io_flush(IN EFI_BLOCK_IO_PROTOCOL *This)
 	return EFI_SUCCESS;
 }

-STATIC UINTN ventoy_get_current_device_path_id(VOID)
-{
-    UINTN i = 0;
-    UINTN Count = 0;
-    UINTN MaxId = 0;
-    UINTN CurId = 0;
-    BOOLEAN Find = FALSE;
-    EFI_HANDLE *Handles = NULL;
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_DEVICE_PATH_PROTOCOL *DevicePath = NULL;
-    VENDOR_DEVICE_PATH *venPath = NULL;
-    
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiDevicePathProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return 0;
-    }
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePath);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        if (DevicePath->Type == HARDWARE_DEVICE_PATH && DevicePath->SubType == HW_VENDOR_DP)
-        {
-            venPath = (VENDOR_DEVICE_PATH *)DevicePath;
-            if (CompareGuid(&venPath->Guid, &gVtoyBlockDevicePathGuid))
-            {
-                CurId = StrDecimalToUintn((CHAR16 *)(venPath + 1) + StrLen(L"ventoy_"));
-                MaxId = MAX(MaxId, CurId);
-                Find = TRUE;
-            }
-        }
-    }
-
-    FreePool(Handles);
-
-    return Find ? (MaxId + 1) : 0;
-}

 EFI_STATUS EFIAPI ventoy_fill_device_path(VOID)
 {
-    UINTN CurVtoyDpId = 0;
    UINTN NameLen = 0;
    UINT8 TmpBuf[128] = {0};
    VENDOR_DEVICE_PATH *venPath = NULL;
-    CHAR16 VtoyDpName[32];
-
-    CurVtoyDpId = ventoy_get_current_device_path_id();
-    UnicodeSPrintAsciiFormat(VtoyDpName, sizeof(VtoyDpName), "ventoy_%03lu", CurVtoyDpId);

    venPath = (VENDOR_DEVICE_PATH *)TmpBuf;
-    NameLen = StrSize(VtoyDpName);
+    NameLen = StrSize(VTOY_BLOCK_DEVICE_PATH_NAME);
    venPath->Header.Type = HARDWARE_DEVICE_PATH;
    venPath->Header.SubType = HW_VENDOR_DP;
    venPath->Header.Length[0] = sizeof(VENDOR_DEVICE_PATH) + NameLen;
    venPath->Header.Length[1] = 0;
    CopyMem(&venPath->Guid, &gVtoyBlockDevicePathGuid, sizeof(EFI_GUID));
-    CopyMem(venPath + 1, VtoyDpName, NameLen);
+    CopyMem(venPath + 1, VTOY_BLOCK_DEVICE_PATH_NAME, NameLen);
    
    gBlockData.Path = AppendDevicePathNode(NULL, (EFI_DEVICE_PATH_PROTOCOL *)TmpBuf);
    gBlockData.DevicePathCompareLen = sizeof(VENDOR_DEVICE_PATH) + NameLen;

-    debug("gBlockData.Path=<%lu><%s>\n", CurVtoyDpId, ConvertDevicePathToText(gBlockData.Path, FALSE, FALSE));
+    debug("gBlockData.Path=<%s>\n", ConvertDevicePathToText(gBlockData.Path, FALSE, FALSE));

    return EFI_SUCCESS;
 }
@ -725,7 +670,11 @@ EFI_STATUS EFIAPI ventoy_connect_driver(IN EFI_HANDLE ControllerHandle, IN CONST
            continue;
        }

-        VENTOY_GET_COMPONENT_NAME(Name2Protocol, DriverName);
+        Status = Name2Protocol->GetDriverName(Name2Protocol, "en", &DriverName);
+        if (EFI_ERROR(Status) || NULL == DriverName)
+        {
+            continue;
+        }

        if (StrStr(DriverName, DrvName))
        {
@ -763,7 +712,11 @@ EFI_STATUS EFIAPI ventoy_connect_driver(IN EFI_HANDLE ControllerHandle, IN CONST
            continue;
        }

-        VENTOY_GET_COMPONENT_NAME(NameProtocol, DriverName);
+        Status = NameProtocol->GetDriverName(NameProtocol, "en", &DriverName);
+        if (EFI_ERROR(Status))
+        {
+            continue;
+        }

        if (StrStr(DriverName, DrvName))
        {
@ -788,223 +741,6 @@ end:
    return Status;
 }

-
-STATIC BOOLEAN ventoy_filesystem_need_wrapper(IN CONST CHAR16 *DrvName)
-{
-    UINTN i;
-    CHAR16 UpperDrvName[256];
-
-    StrCpyS(UpperDrvName, 256, DrvName);
-
-    for (i = 0; i < 256 && UpperDrvName[i]; i++)
-    {
-        if (UpperDrvName[i] >= 'a' && UpperDrvName[i] <= 'z')
-        {
-            UpperDrvName[i] = 'A' + (UpperDrvName[i] - 'a');
-        }
-    }
-
-    /*
-     * suppress some file system drivers 
-     *  1. rEFInd File System Driver
-     *
-     */
-    
-    if (StrStr(UpperDrvName, L"REFIND") && StrStr(UpperDrvName, L"FILE SYSTEM"))
-    {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-STATIC VOID ventoy_add_filesystem_wrapper
-(
-    IN EFI_DRIVER_BINDING_PROTOCOL *DriverBindProtocol, 
-    IN CONST CHAR16 *DriverName
-)
-{
-    UINTN j;
-
-    if (g_DriverBindWrapperCnt >= MAX_DRIVER_BIND_WRAPPER)
-    {
-        debug("driver binding wrapper overflow %lu", g_DriverBindWrapperCnt);
-        return;
-    }
-
-    if (!ventoy_filesystem_need_wrapper(DriverName))
-    {
-        return;
-    }
-
-    for (j = 0; j < g_DriverBindWrapperCnt; j++)
-    {
-        if (g_DriverBindWrapperList[j].DriverBinding == DriverBindProtocol)
-        {
-            debug("Duplicate driverbinding <%s> %p %lu %lu", DriverName, DriverBindProtocol, j, g_DriverBindWrapperCnt);
-            break;
-        }
-    }
-
-    if (j >= g_DriverBindWrapperCnt)
-    {
-        g_DriverBindWrapperList[g_DriverBindWrapperCnt].DriverBinding = DriverBindProtocol;
-        g_DriverBindWrapperList[g_DriverBindWrapperCnt].pfOldSupport = DriverBindProtocol->Supported;
-        g_DriverBindWrapperCnt++;
-        debug("Add driverbinding <%s> %p %lu", DriverName, DriverBindProtocol, g_DriverBindWrapperCnt);
-    }
-}
-
-STATIC EFI_STATUS ventoy_find_filesystem_driverbind(VOID)
-{
-    UINTN i = 0;
-    UINTN Count = 0;
-    CHAR16 *DriverName = NULL;
-    EFI_HANDLE *Handles = NULL;
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_COMPONENT_NAME_PROTOCOL *NameProtocol = NULL;
-    EFI_COMPONENT_NAME2_PROTOCOL *Name2Protocol = NULL;
-    EFI_DRIVER_BINDING_PROTOCOL *DriverBindProtocol = NULL;
-    
-    debug("ventoy_find_filesystem_driverbind...");
-
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentName2ProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentName2ProtocolGuid, (VOID **)&Name2Protocol);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        VENTOY_GET_COMPONENT_NAME(Name2Protocol, DriverName);
-
-        Status = gBS->HandleProtocol(Handles[i], &gEfiDriverBindingProtocolGuid, (VOID **)&DriverBindProtocol);
-        if (EFI_ERROR(Status))
-        {
-            debug("### 2 No DriverBind <%s> <%r>", DriverName, Status);
-            continue;
-        }
-
-        ventoy_add_filesystem_wrapper(DriverBindProtocol, DriverName);
-    }
-
-    Count = 0;
-    FreePool(Handles);
-    Handles = NULL;
-
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentNameProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentNameProtocolGuid, (VOID **)&NameProtocol);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        VENTOY_GET_COMPONENT_NAME(NameProtocol, DriverName);
-
-        Status = gBS->HandleProtocol(Handles[i], &gEfiDriverBindingProtocolGuid, (VOID **)&DriverBindProtocol);
-        if (EFI_ERROR(Status))
-        {
-            debug("### 1 No DriverBind <%s> <%r>", DriverName, Status);
-            continue;
-        }
-
-        ventoy_add_filesystem_wrapper(DriverBindProtocol, DriverName);
-    }
-
-    FreePool(Handles);
-    
-    return EFI_SUCCESS;
-}
-
-STATIC EFI_STATUS EFIAPI ventoy_wrapper_driver_bind_support
-(
-    IN EFI_DRIVER_BINDING_PROTOCOL            *This,
-    IN EFI_HANDLE                              ControllerHandle,
-    IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL
-)
-{
-    UINTN i;
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_DEVICE_PATH_PROTOCOL *DevicePath = NULL;
-    EFI_DRIVER_BINDING_SUPPORTED pfOldSupport = NULL;
-
-    for (i = 0; i < g_DriverBindWrapperCnt; i++)
-    {
-        if (g_DriverBindWrapperList[i].DriverBinding == This)
-        {
-            pfOldSupport = g_DriverBindWrapperList[i].pfOldSupport;
-            break;
-        }
-    }
-
-    debug("ventoy_wrapper_driver_bind_support %lu %p", i, pfOldSupport);
-
-    if (!pfOldSupport)
-    {
-        return EFI_UNSUPPORTED;
-    }
-
-    Status = gBS->HandleProtocol(ControllerHandle, &gEfiDevicePathProtocolGuid, (VOID **)&DevicePath);
-    if (EFI_ERROR(Status))
-    {
-        goto out;
-    }
-
-    if (0 == CompareMem(gBlockData.Path, DevicePath, gBlockData.DevicePathCompareLen))
-    {
-        debug("return EFI_UNSUPPORTED for ventoy");
-        return EFI_UNSUPPORTED;
-    }
-
-out:
-    return pfOldSupport(This, ControllerHandle, RemainingDevicePath);
-}
-
-EFI_STATUS ventoy_disable_ex_filesystem(VOID)
-{
-    UINTN i;
-
-    ventoy_find_filesystem_driverbind();
-
-    for (i = 0; i < g_DriverBindWrapperCnt; i++)
-    {
-        g_DriverBindWrapperList[i].DriverBinding->Supported = ventoy_wrapper_driver_bind_support;
-    }
-
-    debug("Wrapper Ex Driver Binding %lu", g_DriverBindWrapperCnt);
-    ventoy_debug_pause();
-    
-    return EFI_SUCCESS;
-}
-
-EFI_STATUS ventoy_enable_ex_filesystem(VOID)
-{
-    UINTN i;
-
-    for (i = 0; i < g_DriverBindWrapperCnt; i++)
-    {
-        g_DriverBindWrapperList[i].DriverBinding->Supported = g_DriverBindWrapperList[i].pfOldSupport;
-    }
-    g_DriverBindWrapperCnt = 0;
-
-    return EFI_SUCCESS;
-}
-
 EFI_STATUS EFIAPI ventoy_block_io_read_512
 (
    IN EFI_BLOCK_IO_PROTOCOL          *This,
@ -1139,15 +875,14 @@ EFI_STATUS EFIAPI ventoy_install_blockio(IN EFI_HANDLE ImageHandle, IN UINT64 Im
    {
        gBlockData.Media.BlockSize = 512;
        gBlockData.Media.LastBlock = ImgSize / 512 - 1;
-        gBlockData.Media.ReadOnly = FALSE;
    }
    else
    {
        gBlockData.Media.BlockSize = 2048;
        gBlockData.Media.LastBlock = ImgSize / 2048 - 1;        
-        gBlockData.Media.ReadOnly = TRUE;
    }
    
+    gBlockData.Media.ReadOnly = TRUE;
    gBlockData.Media.MediaPresent = 1;
    gBlockData.Media.LogicalBlocksPerPhysicalBlock = 1;

@ -1246,98 +981,6 @@ ventoy_wrapper_file_flush_ex(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
 	return EFI_SUCCESS;
 }

-/* Ex version */
-STATIC EFI_STATUS EFIAPI
-ventoy_wrapper_file_flush_ex_img0(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
-{
-    (VOID)This;
-    (VOID)Token;
-	return EFI_SUCCESS;
-}
-/* Ex version */
-STATIC EFI_STATUS EFIAPI
-ventoy_wrapper_file_flush_ex_img1(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
-{
-    (VOID)This;
-    (VOID)Token;
-	return EFI_SUCCESS;
-}
-
-#define DEF_WRAP_FUNC(n) \
-STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_flush_ex_img#n(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token) \
-{\
-    (VOID)This;\
-    (VOID)Token;\
-	return EFI_SUCCESS;\
-}
-
-#define ITEM_WRAP_FUNC(n) ventoy_wrapper_file_flush_ex_img#n
-
-#if (VTOY_MAX_CONF_REPLACE > 2)
-DEF_WRAP_FUNC(2);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 3)
-DEF_WRAP_FUNC(3);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 4)
-DEF_WRAP_FUNC(4);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 5)
-DEF_WRAP_FUNC(5);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 6)
-DEF_WRAP_FUNC(6);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 7)
-DEF_WRAP_FUNC(7);
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 8)
-#error "VTOY_MAX_CONF_REPLACE overflow"
-#endif
-
-static EFI_FILE_FLUSH_EX g_img_flush_func[VTOY_MAX_CONF_REPLACE] = 
-{
-    ventoy_wrapper_file_flush_ex_img0,
-    ventoy_wrapper_file_flush_ex_img1,
-#if (VTOY_MAX_CONF_REPLACE > 2)
-    ITEM_WRAP_FUNC(2),
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 3)
-    ITEM_WRAP_FUNC(3),
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 4)
-    ITEM_WRAP_FUNC(4),
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 5)
-    ITEM_WRAP_FUNC(5),
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 6)
-    ITEM_WRAP_FUNC(6),
-#endif
-#if (VTOY_MAX_CONF_REPLACE > 7)
-    ITEM_WRAP_FUNC(7),
-#endif
-};
-
-STATIC ventoy_efi_file_replace *ventoy_wrapper_get_replace(EFI_FILE_HANDLE This)
-{
-    UINTN i;
-
-    if (This->FlushEx == ventoy_wrapper_file_flush_ex)
-    {
-        return &g_efi_file_replace;
-    }
-
-    for (i = 0; i < VTOY_MAX_CONF_REPLACE; i++)
-    {
-        if (This->FlushEx == g_img_flush_func[i])
-        {
-            return g_img_file_replace + i;
-        }
-    }
-    
-    return NULL;
-}

 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_write(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
@ -1363,20 +1006,19 @@ ventoy_wrapper_file_close(EFI_FILE_HANDLE This)
    return EFI_SUCCESS;
 }

+
 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
 {
-    ventoy_efi_file_replace *replace = NULL;
-
-    replace = ventoy_wrapper_get_replace(This);
-    
-    if (Position <= replace->FileSizeBytes)
+    (VOID)This;
+        
+    if (Position <= g_efi_file_replace.FileSizeBytes)
    {
-        replace->CurPos = Position;
+        g_efi_file_replace.CurPos = Position;
    }
    else
    {
-        replace->CurPos = replace->FileSizeBytes;
+        g_efi_file_replace.CurPos = g_efi_file_replace.FileSizeBytes;
    }
    
    return EFI_SUCCESS;
@ -1385,11 +1027,9 @@ ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_get_pos(EFI_FILE_HANDLE This, UINT64 *Position)
 {
-    ventoy_efi_file_replace *replace = NULL;
+    (VOID)This;

-    replace = ventoy_wrapper_get_replace(This);
-
-    *Position = replace->CurPos;
+    *Position = g_efi_file_replace.CurPos;

    return EFI_SUCCESS;
 }
@ -1399,9 +1039,6 @@ STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, VOID *Data)
 {
    EFI_FILE_INFO *Info = (EFI_FILE_INFO *) Data;
-    ventoy_efi_file_replace *replace = NULL;
-
-    replace = ventoy_wrapper_get_replace(This);

    debug("ventoy_wrapper_file_get_info ... %u", *Len);

@ -1419,8 +1056,8 @@ ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, V
    ZeroMem(Data, sizeof(EFI_FILE_INFO));

    Info->Size = sizeof(EFI_FILE_INFO);
-    Info->FileSize = replace->FileSizeBytes;
-    Info->PhysicalSize = replace->FileSizeBytes;
+    Info->FileSize = g_efi_file_replace.FileSizeBytes;
+    Info->PhysicalSize = g_efi_file_replace.FileSizeBytes;
    Info->Attribute = EFI_FILE_READ_ONLY;
    //Info->FileName = EFI_FILE_READ_ONLY;

@ -1434,24 +1071,23 @@ ventoy_wrapper_file_read(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
 {
    EFI_LBA Lba;
    UINTN ReadLen = *Len;
-    ventoy_efi_file_replace *replace = NULL;
-
-    replace = ventoy_wrapper_get_replace(This);
    
+    (VOID)This;
+
    debug("ventoy_wrapper_file_read ... %u", *Len);

-    if (replace->CurPos + ReadLen > replace->FileSizeBytes)
+    if (g_efi_file_replace.CurPos + ReadLen > g_efi_file_replace.FileSizeBytes)
    {
-        ReadLen = replace->FileSizeBytes - replace->CurPos;
+        ReadLen = g_efi_file_replace.FileSizeBytes - g_efi_file_replace.CurPos;
    }

-    Lba = replace->CurPos / 2048 + replace->BlockIoSectorStart;
+    Lba = g_efi_file_replace.CurPos / 2048 + g_efi_file_replace.BlockIoSectorStart;

    ventoy_block_io_read(NULL, 0, Lba, ReadLen, Data);

    *Len = ReadLen;

-    replace->CurPos += ReadLen;
+    g_efi_file_replace.CurPos += ReadLen;

    return EFI_SUCCESS;
 }
@ -1462,7 +1098,7 @@ ventoy_wrapper_file_read_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN
 	return ventoy_wrapper_file_read(This, &(Token->BufferSize), Token->Buffer);
 }

-STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, BOOLEAN Img, UINTN Index)
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File)
 {
    File->Revision    = EFI_FILE_PROTOCOL_REVISION2;
    File->Open        = ventoy_wrapper_fs_open;
@ -1478,47 +1114,11 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, B
    File->OpenEx      = ventoy_wrapper_file_open_ex;
    File->ReadEx      = ventoy_wrapper_file_read_ex;
    File->WriteEx     = ventoy_wrapper_file_write_ex;
-
-    if (Img)
-    {
-        File->FlushEx = g_img_flush_func[Index];
-    }
-    else
-    {
-        File->FlushEx = ventoy_wrapper_file_flush_ex;
-    }
+    File->FlushEx     = ventoy_wrapper_file_flush_ex;

    return EFI_SUCCESS;
 }

-STATIC BOOLEAN EFIAPI ventoy_replace_name_match(CHAR8 *pReplace, CHAR8 *pName)
-{
-    UINTN Len1, Len2;
-    
-    Len1 = AsciiStrLen(pReplace);
-    Len2 = AsciiStrLen(pName);
-
-    if (Len1 == 0 || Len2 == 0)
-    {
-        return FALSE;
-    }
-
-    if (0 == AsciiStriCmp(pReplace, pName))
-    {
-        return TRUE;
-    }
-
-    if (Len1 > 2 && Len2 > 2)
-    {
-        if ((pReplace[0] != '\\') && (pName[0] == '\\') && (0 == AsciiStriCmp(pReplace, pName + 1)))
-        {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
 STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
 (
    EFI_FILE_HANDLE This, 
@ -1533,40 +1133,27 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
    UINT64 Sectors = 0;
    EFI_STATUS Status = EFI_SUCCESS;
    CHAR8 TmpName[256];
-    CHAR8 OldName[256];
    ventoy_virt_chunk *virt = NULL;
-    ventoy_grub_param_file_replace *replace = NULL;

    debug("## ventoy_wrapper_file_open <%s> ", Name);

-    if ((Mode & EFI_FILE_MODE_WRITE) > 0 && StrCmp(Name, L"\\loader\\random-seed") == 0)
-    {
-        if (gDebugPrint)
-        {
-            debug("## ventoy_wrapper_file_open return NOT_FOUND for random-seed %lx", Mode);
-            sleep(3);
-        }
-        return EFI_NOT_FOUND;
-    }
-
    Status = g_original_fopen(This, New, Name, Mode, Attributes);
    if (EFI_ERROR(Status))
    {
        return Status;
    }

-
    if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC &&
        g_file_replace_list->new_file_virtual_id < g_virt_chunk_num)
    {
        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
        for (j = 0; j < 4; j++)
        {
-            if (ventoy_replace_name_match(g_file_replace_list[i].old_file_name[j], TmpName))
+            if (0 == AsciiStrCmp(g_file_replace_list[i].old_file_name[j], TmpName))
            {
                g_original_fclose(*New);
                *New = &g_efi_file_replace.WrapperHandle;
-                ventoy_wrapper_file_procotol(*New, FALSE, 0);
+                ventoy_wrapper_file_procotol(*New);

                virt = g_virt_chunk + g_file_replace_list->new_file_virtual_id;

@ -1592,52 +1179,6 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
        }
    }

-    for (i = 0; g_img_replace_list && i < VTOY_MAX_CONF_REPLACE; i++)
-    {
-        replace = g_img_replace_list + i;
-        if (replace->magic != GRUB_IMG_REPLACE_MAGIC || replace->new_file_virtual_id >= g_virt_chunk_num)
-        {
-            continue;
-        }
-
-        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
-        for (j = 0; j < replace->old_file_cnt; j++)
-        {
-            AsciiStrCpyS(OldName, sizeof(OldName), replace->old_file_name[j]);
-            if ((0 == AsciiStrCmp(OldName, TmpName)) ||
-                 (AsciiStrnCmp(OldName, "\\loader\\entries\\", 16) == 0 && 
-                  AsciiStrCmp(OldName + 16, TmpName) == 0
-                  )  
-                )
-            {
-                g_original_fclose(*New);
-                *New = &(g_img_file_replace[i].WrapperHandle);
-                ventoy_wrapper_file_procotol(*New, TRUE, i);
-
-                virt = g_virt_chunk + replace->new_file_virtual_id;
-
-                Sectors = (virt->mem_sector_end - virt->mem_sector_start) + (virt->remap_sector_end - virt->remap_sector_start);
-                
-                g_img_file_replace[i].BlockIoSectorStart = virt->mem_sector_start;
-                g_img_file_replace[i].FileSizeBytes = Sectors * 2048;
-
-                if (gDebugPrint)
-                {
-                    debug("## ventoy_wrapper_file_open2 <%s> BlockStart:%lu Sectors:%lu Bytes:%lu", Name,
-                        g_img_file_replace[i].BlockIoSectorStart, Sectors, Sectors * 2048);
-                    sleep(3);
-                }
-                
-                return Status;
-            }
-        }
-    }
-
-    if (g_img_replace_list && StrCmp(Name, L"\\loader\\entries") == 0)
-    {
-        (*New)->Open = ventoy_wrapper_file_open;
-    }
-
    return Status;
 }

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyDrv.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyDrv.c
@ -1,140 +0,0 @@
-/******************************************************************************
- * VtoyDrv.c
- *
- * Copyright (c) 2020, longpanda <admin@ventoy.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <Uefi.h>
-#include <Library/DebugLib.h>
-#include <Library/PrintLib.h>
-#include <Library/UefiLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/UefiApplicationEntryPoint.h>
-#include <Protocol/LoadedImage.h>
-#include <Guid/FileInfo.h>
-#include <Guid/FileSystemInfo.h>
-#include <Protocol/BlockIo.h>
-#include <Protocol/RamDisk.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <VtoyUtil.h>
-
-STATIC UINTN g_EfiDriverNameCnt = 0;
-STATIC CHAR16 *g_EfiDriverNameList[1024] = { NULL };
-
-STATIC EFI_STATUS AddEfiDriverName(IN CHAR16 *DriverName)
-{
-    UINTN i = 0;
-
-    if (g_EfiDriverNameCnt >= 1024)
-    {
-        return EFI_OUT_OF_RESOURCES;
-    }
-
-    for (i = 0; i < g_EfiDriverNameCnt; i++)
-    {
-        if (g_EfiDriverNameList[i] && StrCmp(g_EfiDriverNameList[i], DriverName) == 0)
-        {
-            break;
-        }
-    }
-
-    if (i >= g_EfiDriverNameCnt)
-    {
-        g_EfiDriverNameList[g_EfiDriverNameCnt] = DriverName;
-        g_EfiDriverNameCnt++;
-    }
-
-    return EFI_SUCCESS;
-}
-
-EFI_STATUS ShowEfiDrivers(IN EFI_HANDLE    ImageHandle, IN CONST CHAR16 *CmdLine)
-{
-    UINTN i = 0;
-    UINTN Count = 0;
-    CHAR16 *DriverName = NULL;
-    EFI_HANDLE *Handles = NULL;
-    EFI_STATUS Status = EFI_SUCCESS;
-    EFI_COMPONENT_NAME_PROTOCOL *NameProtocol = NULL;
-    EFI_COMPONENT_NAME2_PROTOCOL *Name2Protocol = NULL;
-    
-    (VOID)ImageHandle;
-    (VOID)CmdLine;
-
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentName2ProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentName2ProtocolGuid, (VOID **)&Name2Protocol);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        DriverName = NULL;
-        Status = VtoyGetComponentName(2, Name2Protocol, &DriverName);
-        if ((!EFI_ERROR(Status)) && (DriverName))
-        {
-            AddEfiDriverName(DriverName);
-        }
-    }
-
-    Count = 0;
-    FreePool(Handles);
-    Handles = NULL;
-
-    Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiComponentNameProtocolGuid, 
-                                     NULL, &Count, &Handles);
-    if (EFI_ERROR(Status))
-    {
-        return Status;
-    }
-
-    for (i = 0; i < Count; i++)
-    {
-        Status = gBS->HandleProtocol(Handles[i], &gEfiComponentNameProtocolGuid, (VOID **)&NameProtocol);
-        if (EFI_ERROR(Status))
-        {
-            continue;
-        }
-
-        DriverName = NULL;
-        Status = VtoyGetComponentName(1, Name2Protocol, &DriverName);
-        if ((!EFI_ERROR(Status)) && (DriverName))
-        {
-            AddEfiDriverName(DriverName);
-        }
-    }
-
-    FreePool(Handles);
-
-    for (i = 0; i < g_EfiDriverNameCnt; i++)
-    {
-        Printf("%2d  %s\n", i, g_EfiDriverNameList[i]);
-    }
-    
-    return EFI_SUCCESS;
-}
-
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.c
@ -44,39 +44,8 @@ STATIC grub_env_printf_pf g_env_printf = NULL;
 STATIC VtoyUtilFeature gFeatureList[] = 
 {
    { L"fix_windows_mmap", FixWindowsMemhole },
-    { L"show_efi_drivers", ShowEfiDrivers    },
 };

-EFI_STATUS VtoyGetComponentName(IN UINTN Ver, IN VOID *Protocol, OUT CHAR16 **DriverName)
-{
-    EFI_STATUS Status = EFI_SUCCESS;
-    CHAR16 *DrvName = NULL;
-    EFI_COMPONENT_NAME_PROTOCOL *NameProtocol = NULL;
-    EFI_COMPONENT_NAME2_PROTOCOL *Name2Protocol = NULL;
-
-    if (1 == Ver)
-    {
-        NameProtocol = (EFI_COMPONENT_NAME_PROTOCOL *)Protocol;
-        Status = NameProtocol->GetDriverName(Protocol, "en", &DrvName);
-        if (EFI_ERROR(Status) || NULL == DrvName)
-        {
-            Status = NameProtocol->GetDriverName(Protocol, "eng", &DrvName);
-        }
-    }
-    else
-    {
-        Name2Protocol = (EFI_COMPONENT_NAME2_PROTOCOL *)Protocol;
-        Status = Name2Protocol->GetDriverName(Protocol, "en", &DrvName);
-        if (EFI_ERROR(Status) || NULL == DrvName)
-        {
-            Status = Name2Protocol->GetDriverName(Protocol, "eng", &DrvName);
-        }
-    }
-
-    *DriverName = DrvName;
-    return Status;
-}
-
 VOID EFIAPI VtoyUtilDebug(IN CONST CHAR8  *Format, ...)
 {
    VA_LIST  Marker;
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h
@ -28,8 +28,6 @@ typedef int (*grub_env_set_pf)(const char *name, const char *val);
 typedef const char * (*grub_env_get_pf)(const char *name);
 typedef int (*grub_env_printf_pf)(const char *fmt, ...);

-#define VTOY_MAX_CONF_REPLACE    2
-
 typedef struct ventoy_grub_param_file_replace
 {
    UINT32 magic;
@ -43,7 +41,6 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
    grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;
 #pragma pack()
@ -60,9 +57,7 @@ VOID EFIAPI VtoyUtilDebug(IN CONST CHAR8  *Format, ...);
 #define debug(expr, ...) if (gVtoyDebugPrint) VtoyUtilDebug("[VTOY] "expr"\n", ##__VA_ARGS__)
 #define Printf VtoyUtilDebug

-EFI_STATUS VtoyGetComponentName(IN UINTN Ver, IN VOID *Protocol, OUT CHAR16 **DriverName);
 EFI_STATUS FixWindowsMemhole(IN EFI_HANDLE    ImageHandle, IN CONST CHAR16 *CmdLine);
-EFI_STATUS ShowEfiDrivers(IN EFI_HANDLE    ImageHandle, IN CONST CHAR16 *CmdLine);

 #endif

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.inf
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.inf
@ -28,7 +28,6 @@
 [Sources]
  VtoyUtil.h
  VtoyUtil.c
-  VtoyDrv.c
  Memhole.c

 [Packages]
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/Makefile.core.def
@ -913,12 +913,6 @@ module = {
  enable = x86_64_efi;
 };

-module = {
-  name = fwload;
-  efi = commands/efi/fwload.c;
-  enable = efi;
-};
-
 module = {
  name = gptsync;
  common = commands/gptsync.c;
@ -1129,21 +1123,6 @@ module = {
  common = commands/sleep.c;
 };

-module = {
-  name = smbios;
-
-  common = commands/smbios.c;
-  efi = commands/efi/smbios.c;
-  i386_pc = commands/i386/pc/smbios.c;
-  i386_coreboot = commands/i386/pc/smbios.c;
-  i386_multiboot = commands/i386/pc/smbios.c;
-
-  enable = efi;
-  enable = i386_pc;
-  enable = i386_coreboot;
-  enable = i386_multiboot;
-};
-
 module = {
  name = suspend;
  ieee1275 = commands/ieee1275/suspend.c;
@ -1533,7 +1512,7 @@ module = {
  name = squash4;
  common = fs/squash4.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -I$(srcdir)/lib/zstd -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };

 module = {
@ -1631,7 +1610,6 @@ module = {
  common = ventoy/ventoy_vhd.c;
  common = ventoy/ventoy_plugin.c;
  common = ventoy/ventoy_json.c;
-  common = ventoy/ventoy_browser.c;
  common = ventoy/lzx.c;
  common = ventoy/xpress.c;
  common = ventoy/huffman.c;
@ -1643,12 +1621,6 @@ module = {
    common = term/setkey.c;
 };

-module = {
-  name = mouse;
-  efi = term/efi/mouse.c;
-  enable = efi;
-};
-
 module = {
  name = hello;
  common = hello/hello.c;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
@ -1,205 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2022  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <grub/dl.h>
-#include <grub/efi/api.h>
-#include <grub/efi/efi.h>
-#include <grub/err.h>
-#include <grub/extcmd.h>
-#include <grub/file.h>
-#include <grub/i18n.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/types.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static grub_efi_guid_t loaded_image_guid = GRUB_EFI_LOADED_IMAGE_GUID;
-
-static grub_efi_status_t
-grub_efi_connect_all (void)
-{
-  grub_efi_status_t status;
-  grub_efi_uintn_t handle_count;
-  grub_efi_handle_t *handle_buffer;
-  grub_efi_uintn_t index;
-  grub_efi_boot_services_t *b;
-  grub_dprintf ("efi", "Connecting ...\n");
-  b = grub_efi_system_table->boot_services;
-  status = efi_call_5 (b->locate_handle_buffer,
-                       GRUB_EFI_ALL_HANDLES, NULL, NULL,
-                       &handle_count, &handle_buffer);
-
-  if (status != GRUB_EFI_SUCCESS)
-    return status;
-
-  for (index = 0; index < handle_count; index++)
-  {
-    status = efi_call_4 (b->connect_controller,
-                         handle_buffer[index], NULL, NULL, 1);
-  }
-
-  if (handle_buffer)
-  {
-    efi_call_1 (b->free_pool, handle_buffer);
-  }
-  return GRUB_EFI_SUCCESS;
-}
-
-static grub_err_t
-grub_efi_load_driver (grub_size_t size, void *boot_image, int connect)
-{
-  grub_efi_status_t status;
-  grub_efi_handle_t driver_handle;
-  grub_efi_boot_services_t *b;
-  grub_efi_loaded_image_t *loaded_image;
-
-  b = grub_efi_system_table->boot_services;
-
-  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle, NULL,
-                       boot_image, size, &driver_handle);
-  if (status != GRUB_EFI_SUCCESS)
-  {
-    if (status == GRUB_EFI_OUT_OF_RESOURCES)
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of resources");
-    else
-      grub_error (GRUB_ERR_BAD_OS, "cannot load image");
-    goto fail;
-  }
-  loaded_image = grub_efi_get_loaded_image (driver_handle);
-  if (! loaded_image)
-  {
-    grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
-    goto fail;
-  }
-  grub_dprintf ("efi", "Registering loaded image\n");
-  status = efi_call_3 (b->handle_protocol, driver_handle,
-                       &loaded_image_guid, (void **)&loaded_image);
-  if (status != GRUB_EFI_SUCCESS)
-  {
-    grub_error (GRUB_ERR_BAD_OS, "not a dirver");
-    goto fail;
-  }
-  grub_dprintf ("efi", "StartImage: %p\n", boot_image);
-  status = efi_call_3 (b->start_image, driver_handle, NULL, NULL);
-  if (status != GRUB_EFI_SUCCESS)
-  {
-    grub_error (GRUB_ERR_BAD_OS, "StartImage failed");
-    goto fail;
-  }
-  if (connect)
-  {
-    status = grub_efi_connect_all ();
-    if (status != GRUB_EFI_SUCCESS)
-    {
-      grub_error (GRUB_ERR_BAD_OS, "cannot connect controllers\n");
-      goto fail;
-    }
-  }
-  grub_dprintf ("efi", "Driver installed\n");
-  return 0;
-fail:
-  return grub_errno;
-}
-
-static const struct grub_arg_option options_fwload[] =
-{
-  {"nc", 'n', 0, N_("Loads the driver, but does not connect the driver."), 0, 0},
-  {0, 0, 0, 0, 0, 0}
-};
-
-static grub_err_t
-grub_cmd_fwload (grub_extcmd_context_t ctxt, int argc, char **args)
-{
-  struct grub_arg_list *state = ctxt->state;
-  int connect = 1;
-  grub_file_t file = 0;
-  grub_efi_boot_services_t *b;
-  grub_efi_status_t status;
-  grub_efi_uintn_t pages = 0;
-  grub_ssize_t size;
-  grub_efi_physical_address_t address;
-  void *boot_image = 0;
-
-  b = grub_efi_system_table->boot_services;
-  if (argc != 1)
-    goto fail;
-
-  file = grub_file_open (args[0], GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE);
-  if (! file)
-    goto fail;
-  size = grub_file_size (file);
-  if (!size)
-  {
-    grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
-    goto fail;
-  }
-  pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);
-  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
-                       GRUB_EFI_LOADER_CODE, pages, &address);
-  if (status != GRUB_EFI_SUCCESS)
-  {
-    grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-    goto fail;
-  }
-  boot_image = (void *) ((grub_addr_t) address);
-  if (grub_file_read (file, boot_image, size) != size)
-  {
-    if (grub_errno == GRUB_ERR_NONE)
-      grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), args[0]);
-    goto fail;
-  }
-  grub_file_close (file);
-  if (state[0].set)
-    connect = 0;
-  if (grub_efi_load_driver (size, boot_image, connect))
-    goto fail;
-  return GRUB_ERR_NONE;
-fail:
-  if (file)
-    grub_file_close (file);
-  if (address)
-    efi_call_2 (b->free_pages, address, pages);
-  return grub_errno;
-}
-
-static grub_err_t
-grub_cmd_fwconnect (grub_extcmd_context_t ctxt __attribute__ ((unused)),
-                    int argc __attribute__ ((unused)),
-                    char **args __attribute__ ((unused)))
-{
-  grub_efi_connect_all ();
-  return GRUB_ERR_NONE;
-}
-
-static grub_extcmd_t cmd_fwload, cmd_fwconnect;
-
-GRUB_MOD_INIT(fwload)
-{
-  cmd_fwload = grub_register_extcmd ("fwload", grub_cmd_fwload, 0, N_("FILE"),
-                                     N_("Install UEFI driver."), options_fwload);
-  cmd_fwconnect = grub_register_extcmd ("fwconnect", grub_cmd_fwconnect, 0,
-                                        NULL, N_("Connect drivers."), 0);
-}
-
-GRUB_MOD_FINI(fwload)
-{
-  grub_unregister_extcmd (cmd_fwload);
-  grub_unregister_extcmd (cmd_fwconnect);
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/smbios.c
@ -1,61 +0,0 @@
-/* smbios.c - get smbios tables. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2019  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/smbios.h>
-#include <grub/misc.h>
-#include <grub/efi/efi.h>
-#include <grub/efi/api.h>
-
-struct grub_smbios_eps *
-grub_machine_smbios_get_eps (void)
-{
-  unsigned i;
-  static grub_efi_packed_guid_t smbios_guid = GRUB_EFI_SMBIOS_TABLE_GUID;
-
-  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
-    {
-      grub_efi_packed_guid_t *guid =
-	&grub_efi_system_table->configuration_table[i].vendor_guid;
-
-      if (! grub_memcmp (guid, &smbios_guid, sizeof (grub_efi_packed_guid_t)))
-	return (struct grub_smbios_eps *)
-	  grub_efi_system_table->configuration_table[i].vendor_table;
-    }
-
-  return 0;
-}
-
-struct grub_smbios_eps3 *
-grub_machine_smbios_get_eps3 (void)
-{
-  unsigned i;
-  static grub_efi_packed_guid_t smbios3_guid = GRUB_EFI_SMBIOS3_TABLE_GUID;
-
-  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
-    {
-      grub_efi_packed_guid_t *guid =
-	&grub_efi_system_table->configuration_table[i].vendor_guid;
-
-      if (! grub_memcmp (guid, &smbios3_guid, sizeof (grub_efi_packed_guid_t)))
-	return (struct grub_smbios_eps3 *)
-	  grub_efi_system_table->configuration_table[i].vendor_table;
-    }
-
-  return 0;
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/hashsum.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/hashsum.c
@ -1,351 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/extcmd.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/crypto.h>
-#include <grub/normal.h>
-#include <grub/i18n.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static const struct grub_arg_option options[] = {
-  {"hash", 'h', 0, N_("Specify hash to use."), N_("HASH"), ARG_TYPE_STRING},
-  {"check", 'c', 0, N_("Check hashes of files with hash list FILE."),
-   N_("FILE"), ARG_TYPE_STRING},
-  {"prefix", 'p', 0, N_("Base directory for hash list."), N_("DIR"),
-   ARG_TYPE_STRING},
-  {"keep-going", 'k', 0, N_("Don't stop after first error."), 0, 0},
-  {"uncompress", 'u', 0, N_("Uncompress file before checksumming."), 0, 0},
-  {0, 0, 0, 0, 0, 0}
-};
-
-static struct { const char *name; const char *hashname; } aliases[] = 
-  {
-    {"sha256sum", "sha256"},
-    {"sha512sum", "sha512"},
-    {"sha1sum", "sha1"},
-    {"md5sum", "md5"},
-    {"crc", "crc32"},
-  };
-
-static inline int
-hextoval (char c)
-{
-  if (c >= '0' && c <= '9')
-    return c - '0';
-  if (c >= 'a' && c <= 'f')
-    return c - 'a' + 10;
-  if (c >= 'A' && c <= 'F')
-    return c - 'A' + 10;
-  return -1;
-}
-
-static grub_err_t
-hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
-{
-  int progress = 0;
-  grub_uint64_t ro = 0;
-  grub_uint64_t div = 0;
-  grub_uint64_t total = 0;
-  void *context;
-  grub_uint8_t *readbuf;
-#define BUF_SIZE 1024 * 1024
-  readbuf = grub_malloc (BUF_SIZE);
-  if (!readbuf)
-    return grub_errno;
-  context = grub_zalloc (hash->contextsize);
-  if (!readbuf || !context)
-    goto fail;
-
-  if (file->size > 16 * 1024 * 1024)
-    progress = 1;
-
-  hash->init (context);
-  while (1)
-    {
-      grub_ssize_t r;
-      r = grub_file_read (file, readbuf, BUF_SIZE);
-      if (r < 0)
-	goto fail;
-      if (r == 0)
-	break;
-      hash->write (context, readbuf, r);
-      if (progress)
-      {
-          total += r;
-          div = grub_divmod64(total * 100, (grub_uint64_t)file->size, &ro);
-          grub_printf("\rCalculating    %s   %d%%    ", hash->name, (int)div);
-          grub_refresh();
-      }
-    }
-  hash->final (context);
-  grub_memcpy (result, hash->read (context), hash->mdlen);
-
-  grub_free (readbuf);
-  grub_free (context);
-  if (progress)
-  {
-    grub_printf("\rCalculating    %s   100%%    \n\r\n", hash->name);
-    grub_refresh();      
-  }
-  return GRUB_ERR_NONE;
-
- fail:
-  grub_free (readbuf);
-  grub_free (context);
-  return grub_errno;
-}
-
-static grub_err_t
-check_list (const gcry_md_spec_t *hash, const char *hashfilename,
-	    const char *prefix, int keep, int uncompress)
-{
-  grub_file_t hashlist, file;
-  char *buf = NULL;
-  grub_uint8_t expected[GRUB_CRYPTO_MAX_MDLEN];
-  grub_uint8_t actual[GRUB_CRYPTO_MAX_MDLEN];
-  grub_err_t err;
-  unsigned i;
-  unsigned unread = 0, mismatch = 0;
-
-  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-
-  hashlist = grub_file_open (hashfilename, GRUB_FILE_TYPE_HASHLIST);
-  if (!hashlist)
-    return grub_errno;
-  
-  while (grub_free (buf), (buf = grub_file_getline (hashlist)))
-    {
-      const char *p = buf;
-      while (grub_isspace (p[0]))
-	p++;
-      for (i = 0; i < hash->mdlen; i++)
-	{
-	  int high, low;
-	  high = hextoval (*p++);
-	  low = hextoval (*p++);
-	  if (high < 0 || low < 0)
-	    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list");
-	  expected[i] = (high << 4) | low;
-	}
-      if ((p[0] != ' ' && p[0] != '\t') || (p[1] != ' ' && p[1] != '\t'))
-	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list");
-      p += 2;
-      if (prefix)
-	{
-	  char *filename;
-	  
-	  filename = grub_xasprintf ("%s/%s", prefix, p);
-	  if (!filename)
-	    return grub_errno;
-	  file = grub_file_open (filename, GRUB_FILE_TYPE_TO_HASH
-				 | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
-				    : GRUB_FILE_TYPE_NONE));
-	  grub_free (filename);
-	}
-      else
-	file = grub_file_open (p, GRUB_FILE_TYPE_TO_HASH
-			       | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
-				  : GRUB_FILE_TYPE_NONE));
-      if (!file)
-	{
-	  grub_file_close (hashlist);
-	  grub_free (buf);
-	  return grub_errno;
-	}
-      err = hash_file (file, hash, actual);
-      grub_file_close (file);
-      if (err)
-	{
-	  grub_printf_ (N_("%s: READ ERROR\n"), p);
-	  if (!keep)
-	    {
-	      grub_file_close (hashlist);
-	      grub_free (buf);
-	      return err;
-	    }
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	  unread++;
-	  continue;
-	}
-      if (grub_crypto_memcmp (expected, actual, hash->mdlen) != 0)
-	{
-	  grub_printf_ (N_("%s: HASH MISMATCH\n"), p);
-	  if (!keep)
-	    {
-	      grub_file_close (hashlist);
-	      grub_free (buf);
-	      return grub_error (GRUB_ERR_TEST_FAILURE,
-				 "hash of '%s' mismatches", p);
-	    }
-	  mismatch++;
-	  continue;	  
-	}
-      grub_printf_ (N_("%s: OK\n"), p);
-    }
-  if (mismatch || unread)
-    return grub_error (GRUB_ERR_TEST_FAILURE,
-		       "%d files couldn't be read and hash "
-		       "of %d files mismatches", unread, mismatch);
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
-		  int argc, char **args)
-{
-  struct grub_arg_list *state = ctxt->state;
-  const char *hashname = NULL;
-  const char *prefix = NULL;
-  const gcry_md_spec_t *hash;
-  unsigned i;
-  int keep = state[3].set;
-  int uncompress = state[4].set;
-  unsigned unread = 0;
-  int len = 0;
-  char hashsum[256];
-
-  for (i = 0; i < ARRAY_SIZE (aliases); i++)
-    if (grub_strcmp (ctxt->extcmd->cmd->name, aliases[i].name) == 0)
-      hashname = aliases[i].hashname;
-  if (state[0].set)
-    hashname = state[0].arg;
-
-  if (!hashname)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no hash specified");
-
-  hash = grub_crypto_lookup_md_by_name (hashname);
-  if (!hash)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown hash");
-
-  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
-    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-
-  if (state[2].set)
-    prefix = state[2].arg;
-
-  if (state[1].set)
-    {
-      if (argc != 0)
-	return grub_error (GRUB_ERR_BAD_ARGUMENT,
-			   "--check is incompatible with file list");
-      return check_list (hash, state[1].arg, prefix, keep, uncompress);
-    }
-
-  for (i = 0; i < (unsigned) argc; i++)
-    {
-      GRUB_PROPERLY_ALIGNED_ARRAY (result, GRUB_CRYPTO_MAX_MDLEN);
-      grub_file_t file;
-      grub_err_t err;
-      unsigned j;
-      int vlnk = 0;
-      file = grub_file_open (args[i], GRUB_FILE_TYPE_TO_HASH
-			     | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
-				: GRUB_FILE_TYPE_NONE));
-      if (!file)
-	{
-	  if (!keep)
-	    return grub_errno;
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	  unread++;
-	  continue;
-	}
-      vlnk = file->vlnk;
-      err = hash_file (file, hash, result);
-      grub_file_close (file);
-      if (err)
-	{
-	  if (!keep)
-	    return err;
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	  unread++;
-	  continue;
-	}
-      for (j = 0; j < hash->mdlen; j++)
-	  {
-	    grub_printf ("%02x", ((grub_uint8_t *) result)[j]);
-        len += grub_snprintf(hashsum + len, sizeof(hashsum) - len, "%02x", ((grub_uint8_t *) result)[j]);
-      }
-      grub_printf ("  %s\n", vlnk ? grub_file_get_vlnk(args[i], NULL) : args[i]);
-      grub_env_set("VT_LAST_CHECK_SUM", hashsum);
-    }
-
-  if (unread)
-    return grub_error (GRUB_ERR_TEST_FAILURE, "%d files couldn't be read",
-		       unread);
-  return GRUB_ERR_NONE;
-}
-
-static grub_extcmd_t cmd, cmd_md5, cmd_sha1, cmd_sha256, cmd_sha512, cmd_crc;
-
-GRUB_MOD_INIT(hashsum)
-{
-  cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum, 0,
-			      N_("-h HASH [-c FILE [-p PREFIX]] "
-				 "[FILE1 [FILE2 ...]]"),
-			      /* TRANSLATORS: "hash checksum" is just to
-				 be a bit more precise, you can treat it as
-				 just "hash".  */
-			      N_("Compute or check hash checksum."),
-			      options);
-  cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum, 0,
-				  N_("[-c FILE [-p PREFIX]] "
-				     "[FILE1 [FILE2 ...]]"),
-				  N_("Compute or check hash checksum."),
-				  options);
-  cmd_sha1 = grub_register_extcmd ("sha1sum", grub_cmd_hashsum, 0,
-				   N_("[-c FILE [-p PREFIX]] "
-				      "[FILE1 [FILE2 ...]]"),
-				   N_("Compute or check hash checksum."),
-				   options);
-  cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum, 0,
-				     N_("[-c FILE [-p PREFIX]] "
-					"[FILE1 [FILE2 ...]]"),
-				     N_("Compute or check hash checksum."),
-				     options);
-  cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum, 0,
-				     N_("[-c FILE [-p PREFIX]] "
-					"[FILE1 [FILE2 ...]]"),
-				     N_("Compute or check hash checksum."),
-				     options);
-
-  cmd_crc = grub_register_extcmd ("crc", grub_cmd_hashsum, 0,
-				     N_("[-c FILE [-p PREFIX]] "
-					"[FILE1 [FILE2 ...]]"),
-				     N_("Compute or check hash checksum."),
-				     options);
-}
-
-GRUB_MOD_FINI(hashsum)
-{
-  grub_unregister_extcmd (cmd);
-  grub_unregister_extcmd (cmd_md5);
-  grub_unregister_extcmd (cmd_sha1);
-  grub_unregister_extcmd (cmd_sha256);
-  grub_unregister_extcmd (cmd_sha512);
-  grub_unregister_extcmd (cmd_crc);
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/i386/pc/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/i386/pc/smbios.c
@ -1,52 +0,0 @@
-/* smbios.c - get smbios tables. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2019  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/acpi.h>
-#include <grub/smbios.h>
-#include <grub/misc.h>
-
-struct grub_smbios_eps *
-grub_machine_smbios_get_eps (void)
-{
-  grub_uint8_t *ptr;
-
-  grub_dprintf ("smbios", "Looking for SMBIOS EPS. Scanning BIOS\n");
-
-  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
-    if (grub_memcmp (ptr, "_SM_", 4) == 0
-	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps)) == 0)
-      return (struct grub_smbios_eps *) ptr;
-
-  return 0;
-}
-
-struct grub_smbios_eps3 *
-grub_machine_smbios_get_eps3 (void)
-{
-  grub_uint8_t *ptr;
-
-  grub_dprintf ("smbios", "Looking for SMBIOS3 EPS. Scanning BIOS\n");
-
-  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
-    if (grub_memcmp (ptr, "_SM3_", 5) == 0
-	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps3)) == 0)
-      return (struct grub_smbios_eps3 *) ptr;
-
-  return 0;
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/search.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/search.c
@ -68,7 +68,7 @@ iterate_device (const char *name, void *data)
  /* Skip floppy drives when requested.  */
  if (ctx->no_floppy &&
      name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
-    return 0;
+    return 1;

  if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) {
    return 0;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/smbios.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/smbios.c
@ -1,399 +0,0 @@
-/* smbios.c - retrieve smbios information. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2019  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/smbios.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-/* Abstract useful values found in either the SMBIOS3 or SMBIOS EPS. */
-static struct {
-  grub_addr_t start;
-  grub_addr_t end;
-  grub_uint16_t structures;
-} table_desc;
-
-static grub_extcmd_t cmd;
-
-/* Locate the SMBIOS entry point structure depending on the hardware. */
-struct grub_smbios_eps *
-grub_smbios_get_eps (void)
-{
-  static struct grub_smbios_eps *eps = NULL;
-
-  if (eps != NULL)
-    return eps;
-
-  eps = grub_machine_smbios_get_eps ();
-
-  return eps;
-}
-
-/* Locate the SMBIOS3 entry point structure depending on the hardware. */
-static struct grub_smbios_eps3 *
-grub_smbios_get_eps3 (void)
-{
-  static struct grub_smbios_eps3 *eps = NULL;
-
-  if (eps != NULL)
-    return eps;
-
-  eps = grub_machine_smbios_get_eps3 ();
-
-  return eps;
-}
-
-static char *
-linux_string (const char *value)
-{
-  char *out = grub_malloc( grub_strlen (value) + 1);
-  const char *src = value;
-  char *dst = out;
-
-  for (; *src; src++)
-    if (*src > ' ' && *src < 127 && *src != ':')
-      *dst++ = *src;
-
-  *dst = 0;
-  return out;
-}
-
-/*
- * These functions convert values from the various SMBIOS structure field types
- * into a string formatted to be returned to the user.  They expect that the
- * structure and offset were already validated.  When the requested data is
- * successfully retrieved and formatted, the pointer to the string is returned;
- * otherwise, NULL is returned on failure.  Don't free the result.
- */
-
-static const char *
-grub_smbios_format_byte (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  static char buffer[sizeof ("255")];
-
-  grub_snprintf (buffer, sizeof (buffer), "%u", structure[offset]);
-
-  return (const char *)buffer;
-}
-
-static const char *
-grub_smbios_format_word (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  static char buffer[sizeof ("65535")];
-
-  grub_uint16_t value = grub_get_unaligned16 (structure + offset);
-  grub_snprintf (buffer, sizeof (buffer), "%u", value);
-
-  return (const char *)buffer;
-}
-
-static const char *
-grub_smbios_format_dword (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  static char buffer[sizeof ("4294967295")];
-
-  grub_uint32_t value = grub_get_unaligned32 (structure + offset);
-  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT32_T, value);
-
-  return (const char *)buffer;
-}
-
-static const char *
-grub_smbios_format_qword (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  static char buffer[sizeof ("18446744073709551615")];
-
-  grub_uint64_t value = grub_get_unaligned64 (structure + offset);
-  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT64_T, value);
-
-  return (const char *)buffer;
-}
-
-static const char *
-grub_smbios_get_string (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  const grub_uint8_t *ptr = structure + structure[1];
-  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
-  const grub_uint8_t referenced_string_number = structure[offset];
-  grub_uint8_t i;
-
-  /* A string referenced with zero is interpreted as unset. */
-  if (referenced_string_number == 0)
-    return NULL;
-
-  /* Search the string set. */
-  for (i = 1; *ptr != 0 && ptr < table_end; i++)
-    if (i == referenced_string_number)
-      {
-        const char *str = (const char *)ptr;
-        while (*ptr++ != 0)
-          if (ptr >= table_end)
-            return NULL; /* The string isn't terminated. */
-        return str;
-      }
-    else
-      while (*ptr++ != 0 && ptr < table_end);
-
-  /* The string number is greater than the number of strings in the set. */
-  return NULL;
-}
-
-static const char *
-grub_smbios_format_uuid (const grub_uint8_t *structure, grub_uint8_t offset)
-{
-  static char buffer[sizeof ("ffffffff-ffff-ffff-ffff-ffffffffffff")];
-  const grub_uint8_t *f = structure + offset; /* little-endian fields */
-  const grub_uint8_t *g = f + 8; /* byte-by-byte fields */
-
-  grub_snprintf (buffer, sizeof (buffer),
-                 "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
-                 "%02x%02x-%02x%02x%02x%02x%02x%02x",
-                 f[3], f[2], f[1], f[0], f[5], f[4], f[7], f[6],
-                 g[0], g[1], g[2], g[3], g[4], g[5], g[6], g[7]);
-
-  return (const char *)buffer;
-}
-
-/* List the field formatting functions and the number of bytes they need. */
-static const struct {
-  const char *(*format) (const grub_uint8_t *structure, grub_uint8_t offset);
-  grub_uint8_t field_length;
-} field_extractors[] = {
-  {grub_smbios_format_byte, 1},
-  {grub_smbios_format_word, 2},
-  {grub_smbios_format_dword, 4},
-  {grub_smbios_format_qword, 8},
-  {grub_smbios_get_string, 1},
-  {grub_smbios_format_uuid, 16}
-};
-
-/* List command options, with structure field getters ordered as above. */
-#define FIRST_GETTER_OPT (3)
-#define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
-#define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
-
-static const struct grub_arg_option options[] = {
-  {"type",       't', 0, N_("Match structures with the given type."),
-                         N_("type"), ARG_TYPE_INT},
-  {"handle",     'h', 0, N_("Match structures with the given handle."),
-                         N_("handle"), ARG_TYPE_INT},
-  {"match",      'm', 0, N_("Select a structure when several match."),
-                         N_("match"), ARG_TYPE_INT},
-  {"get-byte",   'b', 0, N_("Get the byte's value at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"get-word",   'w', 0, N_("Get two bytes' value at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"get-dword",  'd', 0, N_("Get four bytes' value at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"get-qword",  'q', 0, N_("Get eight bytes' value at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"get-string", 's', 0, N_("Get the string specified at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"get-uuid",   'u', 0, N_("Get the UUID's value at the given offset."),
-                         N_("offset"), ARG_TYPE_INT},
-  {"set",       '\0', 0, N_("Store the value in the given variable name."),
-                         N_("variable"), ARG_TYPE_STRING},
-  {"linux",     '\0', 0, N_("Filter the result like linux does."),
-                         N_("variable"), ARG_TYPE_NONE},
-  {0, 0, 0, 0, 0, 0}
-};
-
-/*
- * Return a matching SMBIOS structure.
- *
- * This method can use up to three criteria for selecting a structure:
- *   - The "type" field                  (use -1 to ignore)
- *   - The "handle" field                (use -1 to ignore)
- *   - Which to return if several match  (use  0 to ignore)
- *
- * The return value is a pointer to the first matching structure.  If no
- * structures match the given parameters, NULL is returned.
- */
-static const grub_uint8_t *
-grub_smbios_match_structure (const grub_int16_t type,
-                             const grub_int32_t handle,
-                             const grub_uint16_t match)
-{
-  const grub_uint8_t *ptr = (const grub_uint8_t *)table_desc.start;
-  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
-  grub_uint16_t structures = table_desc.structures;
-  grub_uint16_t structure_count = 0;
-  grub_uint16_t matches = 0;
-
-  while (ptr < table_end
-         && ptr[1] >= 4 /* Valid structures include the 4-byte header. */
-         && (structure_count++ < structures || structures == 0))
-    {
-      grub_uint16_t structure_handle = grub_get_unaligned16 (ptr + 2);
-      grub_uint8_t structure_type = ptr[0];
-
-      if ((handle < 0 || handle == structure_handle)
-          && (type < 0 || type == structure_type)
-          && (match == 0 || match == ++matches))
-        return ptr;
-      else
-        {
-          ptr += ptr[1];
-          while ((*ptr++ != 0 || *ptr++ != 0) && ptr < table_end);
-        }
-
-      if (structure_type == GRUB_SMBIOS_TYPE_END_OF_TABLE)
-        break;
-    }
-
-  return NULL;
-}
-
-static grub_err_t
-grub_cmd_smbios (grub_extcmd_context_t ctxt,
-                 int argc __attribute__ ((unused)),
-                 char **argv __attribute__ ((unused)))
-{
-  struct grub_arg_list *state = ctxt->state;
-
-  grub_int16_t type = -1;
-  grub_int32_t handle = -1;
-  grub_uint16_t match = 0;
-  grub_uint8_t offset = 0;
-
-  const grub_uint8_t *structure;
-  const char *value;
-  char *modified_value = NULL;
-  grub_int32_t option;
-  grub_int8_t field_type = -1;
-  grub_uint8_t i;
-
-  if (table_desc.start == 0)
-    return grub_error (GRUB_ERR_IO,
-                       N_("the SMBIOS entry point structure was not found"));
-
-  /* Read the given filtering options. */
-  if (state[0].set)
-    {
-      option = grub_strtol (state[0].arg, NULL, 0);
-      if (option < 0 || option > 255)
-        return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           N_("the type must be between 0 and 255"));
-      type = (grub_int16_t)option;
-    }
-  if (state[1].set)
-    {
-      option = grub_strtol (state[1].arg, NULL, 0);
-      if (option < 0 || option > 65535)
-        return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           N_("the handle must be between 0 and 65535"));
-      handle = (grub_int32_t)option;
-    }
-  if (state[2].set)
-    {
-      option = grub_strtol (state[2].arg, NULL, 0);
-      if (option <= 0 || option > 65535)
-        return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           N_("the match must be a positive integer"));
-      match = (grub_uint16_t)option;
-    }
-
-  /* Determine the data type of the structure field to retrieve. */
-  for (i = 0; i < ARRAY_SIZE(field_extractors); i++)
-    if (state[FIRST_GETTER_OPT + i].set)
-      {
-        if (field_type >= 0)
-          return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                             N_("only one --get option is usable at a time"));
-        field_type = i;
-      }
-
-  /* Require a choice of a structure field to return. */
-  if (field_type < 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                       N_("one of the --get options is required"));
-
-  /* Locate a matching SMBIOS structure. */
-  structure = grub_smbios_match_structure (type, handle, match);
-  if (structure == NULL)
-    return grub_error (GRUB_ERR_IO,
-                       N_("no structure matched the given options"));
-
-  /* Ensure the requested byte offset is inside the structure. */
-  option = grub_strtol (state[FIRST_GETTER_OPT + field_type].arg, NULL, 0);
-  if (option < 0 || option >= structure[1])
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-                       N_("the given offset is outside the structure"));
-
-  /* Ensure the requested data type at the offset is inside the structure. */
-  offset = (grub_uint8_t)option;
-  if (offset + field_extractors[field_type].field_length > structure[1])
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-                       N_("the field ends outside the structure"));
-
-  /* Format the requested structure field into a readable string. */
-  value = field_extractors[field_type].format (structure, offset);
-  if (value == NULL)
-    return grub_error (GRUB_ERR_IO,
-                       N_("failed to retrieve the structure field"));
-
-  if (state[LINUX_OPT].set)
-    value = modified_value = linux_string (value);
-
-  /* Store or print the formatted value. */
-  if (state[SETTER_OPT].set)
-    grub_env_set (state[SETTER_OPT].arg, value);
-  else
-    grub_printf ("%s\n", value);
-
-  grub_free(modified_value);
-
-  return GRUB_ERR_NONE;
-}
-
-GRUB_MOD_INIT(smbios)
-{
-  struct grub_smbios_eps3 *eps3;
-  struct grub_smbios_eps *eps;
-
-  if ((eps3 = grub_smbios_get_eps3 ()))
-    {
-      table_desc.start = (grub_addr_t)eps3->table_address;
-      table_desc.end = table_desc.start + eps3->maximum_table_length;
-      table_desc.structures = 0; /* SMBIOS3 drops the structure count. */
-    }
-  else if ((eps = grub_smbios_get_eps ()))
-    {
-      table_desc.start = (grub_addr_t)eps->intermediate.table_address;
-      table_desc.end = table_desc.start + eps->intermediate.table_length;
-      table_desc.structures = eps->intermediate.structures;
-    }
-
-  cmd = grub_register_extcmd ("smbios", grub_cmd_smbios, 0,
-                              N_("[-t type] [-h handle] [-m match] "
-                                 "(-b|-w|-d|-q|-s|-u) offset "
-                                 "[--set variable]"),
-                              N_("Retrieve SMBIOS information."), options);
-}
-
-GRUB_MOD_FINI(smbios)
-{
-  grub_unregister_extcmd (cmd);
-}
-
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/test.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/test.c
@ -229,13 +229,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-      if (grub_strcmp (args[*argn + 1], "-EQ") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-			  == grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  if (grub_strcmp (args[*argn + 1], "-ge") == 0)
 	    {
@ -244,13 +237,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-	  if (grub_strcmp (args[*argn + 1], "-GE") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-			  >= grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  if (grub_strcmp (args[*argn + 1], "-gt") == 0)
 	    {
@ -259,13 +245,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-	  if (grub_strcmp (args[*argn + 1], "-GT") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-			  > grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  if (grub_strcmp (args[*argn + 1], "-le") == 0)
 	    {
@ -274,13 +253,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-	  if (grub_strcmp (args[*argn + 1], "-LE") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-		      <= grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  if (grub_strcmp (args[*argn + 1], "-lt") == 0)
 	    {
@ -289,13 +261,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-	  if (grub_strcmp (args[*argn + 1], "-LT") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-			  < grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  if (grub_strcmp (args[*argn + 1], "-ne") == 0)
 	    {
@ -304,13 +269,6 @@ test_parse (char **args, int *argn, int argc)
 	      (*argn) += 3;
 	      continue;
 	    }
-	  if (grub_strcmp (args[*argn + 1], "-NE") == 0)
-	    {
-	      update_val (grub_strtoull (args[*argn], 0, 0)
-			  != grub_strtoull (args[*argn + 2], 0, 0), &ctx);
-	      (*argn) += 3;
-	      continue;
-	    }

 	  /* GRUB extension: compare numbers skipping prefixes.
 	     Useful for comparing versions. E.g. vmlinuz-2 -plt vmlinuz-11. */
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/disk/loopback.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/disk/loopback.c
@ -1,257 +0,0 @@
-/* loopback.c - command to add loopback devices.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/mm.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-struct grub_loopback
-{
-  char *devname;
-  grub_file_t file;
-  struct grub_loopback *next;
-  unsigned long id;
-  grub_off_t skip;
-};
-
-static struct grub_loopback *loopback_list;
-static unsigned long last_id = 0;
-
-static const struct grub_arg_option options[] =
-  {
-    /* TRANSLATORS: The disk is simply removed from the list of available ones,
-       not wiped, avoid to scare user.  */
-    {"delete", 'd', 0, N_("Delete the specified loopback drive."), 0, 0},
-    {"skip", 's', 0, "skip sectors of the file.", "SECTORS", ARG_TYPE_INT },
-    {0, 0, 0, 0, 0, 0}
-  };
-
-/* Delete the loopback device NAME.  */
-static grub_err_t
-delete_loopback (const char *name)
-{
-  struct grub_loopback *dev;
-  struct grub_loopback **prev;
-
-  /* Search for the device.  */
-  for (dev = loopback_list, prev = &loopback_list;
-       dev;
-       prev = &dev->next, dev = dev->next)
-    if (grub_strcmp (dev->devname, name) == 0)
-      break;
-
-  if (! dev)
-    return grub_error (GRUB_ERR_BAD_DEVICE, "device not found");
-
-  /* Remove the device from the list.  */
-  *prev = dev->next;
-
-  grub_free (dev->devname);
-  grub_file_close (dev->file);
-  grub_free (dev);
-
-  return 0;
-}
-
-/* The command to add and remove loopback devices.  */
-static grub_err_t
-grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
-{
-  struct grub_arg_list *state = ctxt->state;
-  grub_file_t file;
-  struct grub_loopback *newdev;
-  grub_err_t ret;
-  grub_off_t skip = 0;
-
-  if (argc < 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
-
-  /* Check if `-d' was used.  */
-  if (state[0].set)
-      return delete_loopback (args[0]);
-
-  if (state[1].set)
-      skip = (grub_off_t)grub_strtoull(state[1].arg, NULL, 10);
-
-  if (argc < 2)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-
-  file = grub_file_open (args[1], GRUB_FILE_TYPE_LOOPBACK
-			 | GRUB_FILE_TYPE_NO_DECOMPRESS);
-  if (! file)
-    return grub_errno;
-
-  /* First try to replace the old device.  */
-  for (newdev = loopback_list; newdev; newdev = newdev->next)
-    if (grub_strcmp (newdev->devname, args[0]) == 0)
-      break;
-
-  if (newdev)
-    {
-      grub_file_close (newdev->file);
-      newdev->file = file;
-      newdev->skip = skip;
-
-      return 0;
-    }
-
-  /* Unable to replace it, make a new entry.  */
-  newdev = grub_malloc (sizeof (struct grub_loopback));
-  if (! newdev)
-    goto fail;
-
-  newdev->devname = grub_strdup (args[0]);
-  if (! newdev->devname)
-    {
-      grub_free (newdev);
-      goto fail;
-    }
-
-  newdev->file = file;
-  newdev->skip = skip;
-  newdev->id = last_id++;
-
-  /* Add the new entry to the list.  */
-  newdev->next = loopback_list;
-  loopback_list = newdev;
-
-  return 0;
-
-fail:
-  ret = grub_errno;
-  grub_file_close (file);
-  return ret;
-}
-
-
-static int
-grub_loopback_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
-		       grub_disk_pull_t pull)
-{
-  struct grub_loopback *d;
-  if (pull != GRUB_DISK_PULL_NONE)
-    return 0;
-  for (d = loopback_list; d; d = d->next)
-    {
-      if (hook (d->devname, hook_data))
-	return 1;
-    }
-  return 0;
-}
-
-static grub_err_t
-grub_loopback_open (const char *name, grub_disk_t disk)
-{
-  struct grub_loopback *dev;
-
-  for (dev = loopback_list; dev; dev = dev->next)
-    if (grub_strcmp (dev->devname, name) == 0)
-      break;
-
-  if (! dev)
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-
-  /* Use the filesize for the disk size, round up to a complete sector.  */
-  if (dev->file->size != GRUB_FILE_SIZE_UNKNOWN)
-    disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1)
-			   / GRUB_DISK_SECTOR_SIZE);
-  else
-    disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
-  /* Avoid reading more than 512M.  */
-  disk->max_agglomerate = 1 << (29 - GRUB_DISK_SECTOR_BITS
-				- GRUB_DISK_CACHE_BITS);
-
-  disk->id = dev->id;
-
-  disk->data = dev;
-
-  return 0;
-}
-
-static grub_err_t
-grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
-		    grub_size_t size, char *buf)
-{
-  grub_file_t file = ((struct grub_loopback *) disk->data)->file;
-  grub_off_t skip = ((struct grub_loopback *) disk->data)->skip;
-  grub_off_t pos;
-
-  grub_file_seek (file, (sector + skip) << GRUB_DISK_SECTOR_BITS);
-
-  grub_file_read (file, buf, size << GRUB_DISK_SECTOR_BITS);
-  if (grub_errno)
-    return grub_errno;
-
-  /* In case there is more data read than there is available, in case
-     of files that are not a multiple of GRUB_DISK_SECTOR_SIZE, fill
-     the rest with zeros.  */
-  pos = (sector + skip + size) << GRUB_DISK_SECTOR_BITS;
-  if (pos > file->size)
-    {
-      grub_size_t amount = pos - file->size;
-      grub_memset (buf + (size << GRUB_DISK_SECTOR_BITS) - amount, 0, amount);
-    }
-
-  return 0;
-}
-
-static grub_err_t
-grub_loopback_write (grub_disk_t disk __attribute ((unused)),
-		     grub_disk_addr_t sector __attribute ((unused)),
-		     grub_size_t size __attribute ((unused)),
-		     const char *buf __attribute ((unused)))
-{
-  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		     "loopback write is not supported");
-}
-
-static struct grub_disk_dev grub_loopback_dev =
-  {
-    .name = "loopback",
-    .id = GRUB_DISK_DEVICE_LOOPBACK_ID,
-    .disk_iterate = grub_loopback_iterate,
-    .disk_open = grub_loopback_open,
-    .disk_read = grub_loopback_read,
-    .disk_write = grub_loopback_write,
-    .next = 0
-  };
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(loopback)
-{
-  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, 0,
-			      N_("[-d] DEVICENAME FILE."),
-			      /* TRANSLATORS: The file itself is not destroyed
-				 or transformed into drive.  */
-			      N_("Make a virtual drive from a file."), options);
-  grub_disk_dev_register (&grub_loopback_dev);
-}
-
-GRUB_MOD_FINI(loopback)
-{
-  grub_unregister_extcmd (cmd);
-  grub_disk_dev_unregister (&grub_loopback_dev);
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/font/font.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/font/font.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/ext2.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/ext2.c
@ -103,7 +103,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
 #define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
 #define EXT4_FEATURE_INCOMPAT_MMP		0x0100
 #define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
-#define EXT4_FEATURE_INCOMPAT_CSUM_SEED		0x2000
 #define EXT4_FEATURE_INCOMPAT_ENCRYPT          0x10000

 /* The set of back-incompatible features this driver DOES support. Add (OR)
@ -124,16 +123,9 @@ GRUB_MOD_LICENSE ("GPLv3+");
 * mmp:            Not really back-incompatible - was added as such to
 *                 avoid multiple read-write mounts. Safe to ignore for this
 *                 RO driver.
- * checksum seed:  Not really back-incompatible - was added to allow tools
- *                 such as tune2fs to change the UUID on a mounted metadata
- *                 checksummed filesystem. Safe to ignore for now since the
- *                 driver doesn't support checksum verification. But it must
- *                 be removed from this list if that support is added later.
- *
 */
 #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
-				     | EXT4_FEATURE_INCOMPAT_MMP \
-				     | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
+				     | EXT4_FEATURE_INCOMPAT_MMP)


 #define EXT3_JOURNAL_MAGIC_NUMBER	0xc03b3998U
@ -731,11 +723,10 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
  if (! symlink)
    return 0;

-  /*
-   * If the filesize of the symlink is equal to or bigger than 60 the symlink
-   * is stored in a separate block, otherwise it is stored in the inode.
-   */
-  if (grub_le_to_cpu32 (diro->inode.size) < sizeof (diro->inode.symlink))
+  /* If the filesize of the symlink is bigger than
+     60 the symlink is stored in a separate block,
+     otherwise it is stored in the inode.  */
+  if (grub_le_to_cpu32 (diro->inode.size) <= sizeof (diro->inode.symlink))
    grub_memcpy (symlink,
 		 diro->inode.symlink,
 		 grub_le_to_cpu32 (diro->inode.size));
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
@ -426,7 +426,7 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
 	  if (grub_errno)
 	    return -1;
 	}
-      else if (read_hook != (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read)
+      else if (read_hook != (grub_disk_read_hook_t)grub_disk_blocklist_read)
 	grub_memset (buf, 0, blockend);

      buf += blocksize - skipfirst;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/iso9660.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/iso9660.c
@ -33,7 +33,6 @@
 GRUB_MOD_LICENSE ("GPLv3+");

 static int g_ventoy_no_joliet = 0;
-static int g_ventoy_cur_joliet = 0;
 static grub_uint64_t g_ventoy_last_read_pos = 0;
 static grub_uint64_t g_ventoy_last_read_offset = 0;
 static grub_uint64_t g_ventoy_last_read_dirent_pos = 0;
@ -452,7 +451,6 @@ grub_iso9660_mount (grub_disk_t disk)

  data->disk = disk;

-  g_ventoy_cur_joliet = 0;
  block = 16;
  do
    {
@ -486,7 +484,6 @@ grub_iso9660_mount (grub_disk_t disk)
          if (0 == g_ventoy_no_joliet) {
            copy_voldesc = 1;
            data->joliet = 1;
-            g_ventoy_cur_joliet = 1;
          }
        }

@ -1121,11 +1118,6 @@ void grub_iso9660_set_nojoliet(int nojoliet)
    g_ventoy_no_joliet = nojoliet;
 }

-int grub_iso9660_is_joliet(void)
-{
-    return g_ventoy_cur_joliet;
-}
-
 grub_uint64_t grub_iso9660_get_last_read_pos(grub_file_t file)
 {
    (void)file;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/ntfs.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/ntfs.c
@ -889,7 +889,6 @@ grub_ntfs_mount (grub_disk_t disk)
  struct grub_ntfs_bpb bpb;
  struct grub_ntfs_data *data = 0;
  grub_uint32_t spc;
-  grub_uint32_t sectors_per_cluster;

  if (!disk)
    goto fail;
@ -904,18 +903,14 @@ grub_ntfs_mount (grub_disk_t disk)
  if (grub_disk_read (disk, 0, 0, sizeof (bpb), &bpb))
    goto fail;

-  sectors_per_cluster = bpb.sectors_per_cluster;
-  if (sectors_per_cluster > 0x80)
-    sectors_per_cluster = 1U << (256U - bpb.sectors_per_cluster);
-
  if (grub_memcmp ((char *) &bpb.oem_name, "NTFS", 4) != 0
-      || sectors_per_cluster == 0
-      || (sectors_per_cluster & (sectors_per_cluster - 1)) != 0
+      || bpb.sectors_per_cluster == 0
+      || (bpb.sectors_per_cluster & (bpb.sectors_per_cluster - 1)) != 0
      || bpb.bytes_per_sector == 0
      || (bpb.bytes_per_sector & (bpb.bytes_per_sector - 1)) != 0)
    goto fail;

-  spc = (((grub_uint32_t) sectors_per_cluster
+  spc = (((grub_uint32_t) bpb.sectors_per_cluster
 	  * (grub_uint32_t) grub_le_to_cpu16 (bpb.bytes_per_sector))
 	 >> GRUB_NTFS_BLK_SHR);
  if (spc == 0)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/squash4.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/squash4.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/xfs.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/xfs.c
@ -23,25 +23,11 @@
 #include <grub/misc.h>
 #include <grub/disk.h>
 #include <grub/dl.h>
-#include <grub/time.h>
 #include <grub/types.h>
 #include <grub/fshelp.h>

 GRUB_MOD_LICENSE ("GPLv3+");

-#define NSEC_PER_SEC ((grub_int64_t) 1000000000)
-
-// GRUB 2.04 doesn't have safemath.h
-// #include <grub/safemath.h>
-
-// gcc < 5.1 doesn't support __builtin_add_overflow and __builtin_mul_overflow
-// #define grub_add(a, b, res) __builtin_add_overflow(a, b, res)
-// #define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res)
-// Warning: This is unsafe!
-#define grub_add(a, b, res) ({ *(res) = (a) + (b); 0; })
-
-#define grub_mul(a, b, res) ({ *(res) = (a) * (b); 0; })
-
 #define	XFS_INODE_EXTENTS	9

 #define XFS_INODE_FORMAT_INO	1
@ -88,22 +74,10 @@ GRUB_MOD_LICENSE ("GPLv3+");
 	 XFS_SB_VERSION2_PROJID32BIT | \
 	 XFS_SB_VERSION2_FTYPE)

-/* Inode flags2 flags */
-#define XFS_DIFLAG2_BIGTIME_BIT	3
-#define XFS_DIFLAG2_BIGTIME		(1 << XFS_DIFLAG2_BIGTIME_BIT)
-#define XFS_DIFLAG2_NREXT64_BIT	4
-#define XFS_DIFLAG2_NREXT64		(1 << XFS_DIFLAG2_NREXT64_BIT)
-
 /* incompat feature flags */
 #define XFS_SB_FEAT_INCOMPAT_FTYPE      (1 << 0)        /* filetype in dirent */
 #define XFS_SB_FEAT_INCOMPAT_SPINODES   (1 << 1)        /* sparse inode chunks */
 #define XFS_SB_FEAT_INCOMPAT_META_UUID  (1 << 2)        /* metadata UUID */
-#define XFS_SB_FEAT_INCOMPAT_BIGTIME    (1 << 3)        /* large timestamps */
-#define XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR (1 << 4)       /* needs xfs_repair */
-#define XFS_SB_FEAT_INCOMPAT_NREXT64    (1 << 5)        /* large extent counters */
-#define XFS_SB_FEAT_INCOMPAT_EXCHRANGE  (1 << 6)        /* exchangerange supported */
-#define XFS_SB_FEAT_INCOMPAT_PARENT     (1 << 7)        /* parent pointers */
-#define XFS_SB_FEAT_INCOMPAT_METADIR    (1 << 8)        /* metadata dir tree */

 /*
 * Directory entries with ftype are explicitly handled by GRUB code.
@ -113,26 +87,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
 *
 * We do not currently verify metadata UUID, so it is safe to read filesystems
 * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
- *
- * We do not currently replay the log, so it is safe to read filesystems
- * with the XFS_SB_FEAT_INCOMPAT_EXCHRANGE feature.
- *
- * We do not currently read directory parent pointers, so it is safe to read
- * filesystems with the XFS_SB_FEAT_INCOMPAT_PARENT feature.
- *
- * We do not currently look at realtime or quota metadata, so it is safe to
- * read filesystems with the XFS_SB_FEAT_INCOMPAT_METADIR feature.
 */
 #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
 	(XFS_SB_FEAT_INCOMPAT_FTYPE | \
 	 XFS_SB_FEAT_INCOMPAT_SPINODES | \
-	 XFS_SB_FEAT_INCOMPAT_META_UUID | \
-	 XFS_SB_FEAT_INCOMPAT_BIGTIME | \
-	 XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR | \
-	 XFS_SB_FEAT_INCOMPAT_NREXT64 | \
-	 XFS_SB_FEAT_INCOMPAT_EXCHRANGE | \
-	 XFS_SB_FEAT_INCOMPAT_PARENT | \
-	 XFS_SB_FEAT_INCOMPAT_METADIR)
+	 XFS_SB_FEAT_INCOMPAT_META_UUID)

 struct grub_xfs_sblock
 {
@ -217,49 +176,33 @@ struct grub_xfs_btree_root
  grub_uint64_t keys[1];
 } GRUB_PACKED;

-struct grub_xfs_time_legacy
+struct grub_xfs_time
 {
  grub_uint32_t sec;
  grub_uint32_t nanosec;
 } GRUB_PACKED;

-/*
- * The struct grub_xfs_inode layout was taken from the
- * struct xfs_dinode_core which is described here:
- * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf
- */
 struct grub_xfs_inode
 {
  grub_uint8_t magic[2];
  grub_uint16_t mode;
  grub_uint8_t version;
  grub_uint8_t format;
-  grub_uint8_t unused2[18];
-  grub_uint64_t nextents_big;
-  grub_uint64_t atime;
-  grub_uint64_t mtime;
-  grub_uint64_t ctime;
+  grub_uint8_t unused2[26];
+  struct grub_xfs_time atime;
+  struct grub_xfs_time mtime;
+  struct grub_xfs_time ctime;
  grub_uint64_t size;
  grub_uint64_t nblocks;
  grub_uint32_t extsize;
  grub_uint32_t nextents;
  grub_uint16_t unused3;
  grub_uint8_t fork_offset;
-  grub_uint8_t unused4[17]; /* Last member of inode v2. */
-  grub_uint8_t unused5[20]; /* First member of inode v3. */
-  grub_uint64_t flags2;
-  grub_uint8_t unused6[48]; /* Last member of inode v3. */
+  grub_uint8_t unused4[17];
 } GRUB_PACKED;

-#define XFS_V3_INODE_SIZE	sizeof(struct grub_xfs_inode)
-/* Size of struct grub_xfs_inode v2, up to unused4 member included. */
-#define XFS_V2_INODE_SIZE	(XFS_V3_INODE_SIZE - 76)
-
-struct grub_xfs_dir_leaf_entry
-{
-  grub_uint32_t hashval;
-  grub_uint32_t address;
-} GRUB_PACKED;
+#define XFS_V2_INODE_SIZE sizeof(struct grub_xfs_inode)
+#define XFS_V3_INODE_SIZE (XFS_V2_INODE_SIZE + 76)

 struct grub_xfs_dirblock_tail
 {
@ -277,7 +220,6 @@ struct grub_fshelp_node

 struct grub_xfs_data
 {
-  grub_size_t data_size;
  struct grub_xfs_sblock sblock;
  grub_disk_t disk;
  int pos;
@ -290,6 +232,8 @@ struct grub_xfs_data

 static grub_dl_t my_mod;

+
+
 static int grub_xfs_sb_hascrc(struct grub_xfs_data *data)
 {
  return (data->sblock.version & grub_cpu_to_be16_compile_time(XFS_SB_VERSION_NUMBITS)) ==
@ -352,21 +296,9 @@ static int grub_xfs_sb_valid(struct grub_xfs_data *data)
 	}
      return 1;
    }
-
-  grub_error (GRUB_ERR_BAD_FS, "unsupported XFS filesystem version");
  return 0;
 }

-static int
-grub_xfs_sb_needs_repair (struct grub_xfs_data *data)
-{
-  return ((data->sblock.version &
-           grub_cpu_to_be16_compile_time (XFS_SB_VERSION_NUMBITS)) ==
-          grub_cpu_to_be16_compile_time (XFS_SB_VERSION_5) &&
-          (data->sblock.sb_features_incompat &
-           grub_cpu_to_be32_compile_time (XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR)));
-}
-
 /* Filetype information as used in inodes.  */
 #define FILETYPE_INO_MASK	0170000
 #define FILETYPE_INO_REG	0100000
@ -422,6 +354,7 @@ GRUB_XFS_EXTENT_SIZE (struct grub_xfs_extent *exts, int ex)
  return (grub_be_to_cpu32 (exts[ex].raw[3]) & ((1 << 21) - 1));
 }

+
 static inline grub_uint64_t
 grub_xfs_inode_block (struct grub_xfs_data *data,
 		      grub_uint64_t ino)
@ -556,7 +489,7 @@ grub_xfs_read_inode (struct grub_xfs_data *data, grub_uint64_t ino,
  grub_uint64_t block = grub_xfs_inode_block (data, ino);
  int offset = grub_xfs_inode_offset (data, ino);

-  grub_dprintf("xfs", "Reading inode (%" PRIuGRUB_UINT64_T ") - %" PRIuGRUB_UINT64_T ", %d\n",
+  grub_dprintf("xfs", "Reading inode (%"PRIuGRUB_UINT64_T") - %"PRIuGRUB_UINT64_T", %d\n",
 	       ino, block, offset);
  /* Read the inode.  */
  if (grub_disk_read (data->disk, block, offset, grub_xfs_inode_size(data),
@ -576,26 +509,11 @@ get_fsb (const void *keys, int idx)
  return grub_be_to_cpu64 (grub_get_unaligned64 (p));
 }

-static int
-grub_xfs_inode_has_large_extent_counts (const struct grub_xfs_inode *inode)
-{
-  return inode->version >= 3 &&
-	 (inode->flags2 & grub_cpu_to_be64_compile_time (XFS_DIFLAG2_NREXT64));
-}
-
-static grub_uint64_t
-grub_xfs_get_inode_nextents (struct grub_xfs_inode *inode)
-{
-  return (grub_xfs_inode_has_large_extent_counts (inode)) ?
-	  grub_be_to_cpu64 (inode->nextents_big) :
-	  grub_be_to_cpu32 (inode->nextents);
-}
-
 static grub_disk_addr_t
 grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 {
  struct grub_xfs_btree_node *leaf = 0;
-  grub_uint64_t ex, nrec;
+  int ex, nrec;
  struct grub_xfs_extent *exts;
  grub_uint64_t ret = 0;

@ -620,18 +538,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 				/ (2 * sizeof (grub_uint64_t));
      do
        {
-          grub_uint64_t i;
-	  grub_addr_t keys_end, data_end;
-
-	  if (grub_mul (sizeof (grub_uint64_t), nrec, &keys_end) ||
-	      grub_add ((grub_addr_t) keys, keys_end, &keys_end) ||
-	      grub_add ((grub_addr_t) node->data, node->data->data_size, &data_end) ||
-	      keys_end > data_end)
-	    {
-	      grub_error (GRUB_ERR_BAD_FS, "invalid number of XFS root keys");
-	      grub_free (leaf);
-	      return 0;
-	    }
+          int i;

          for (i = 0; i < nrec; i++)
            {
@ -649,10 +556,7 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
          if (grub_disk_read (node->data->disk,
                              GRUB_XFS_FSB_TO_BLOCK (node->data, get_fsb (keys, i - 1 + recoffset)) << (node->data->sblock.log2_bsize - GRUB_DISK_SECTOR_BITS),
                              0, node->data->bsize, leaf))
-            {
-              grub_free (leaf);
-              return 0;
-            }
+            return 0;

 	  if ((!node->data->hascrc &&
 	       grub_strncmp ((char *) leaf->magic, "BMAP", 4)) ||
@ -675,20 +579,8 @@ grub_xfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
    }
  else if (node->inode.format == XFS_INODE_FORMAT_EXT)
    {
-      grub_addr_t exts_end = 0;
-      grub_addr_t data_end = 0;
-
-      nrec = grub_xfs_get_inode_nextents (&node->inode);
+      nrec = grub_be_to_cpu32 (node->inode.nextents);
      exts = (struct grub_xfs_extent *) grub_xfs_inode_data(&node->inode);
-
-      if (grub_mul (sizeof (struct grub_xfs_extent), nrec, &exts_end) ||
-	  grub_add ((grub_addr_t) node->data, exts_end, &exts_end) ||
-	  grub_add ((grub_addr_t) node->data, node->data->data_size, &data_end) ||
-	  exts_end > data_end)
-	{
-	  grub_error (GRUB_ERR_BAD_FS, "invalid number of XFS extents");
-	  return 0;
-	}
    }
  else
    {
@ -742,7 +634,6 @@ static char *
 grub_xfs_read_symlink (grub_fshelp_node_t node)
 {
  grub_ssize_t size = grub_be_to_cpu64 (node->inode.size);
-  grub_size_t sz;

  if (size < 0)
    {
@ -764,12 +655,7 @@ grub_xfs_read_symlink (grub_fshelp_node_t node)
 	if (node->data->hascrc)
 	  off = 56;

-	if (grub_add (size, 1, &sz))
-	  {
-	    grub_error (GRUB_ERR_OUT_OF_RANGE, N_("symlink size overflow"));
-	    return 0;
-	  }
-	symlink = grub_malloc (sz);
+	symlink = grub_malloc (size + 1);
 	if (!symlink)
 	  return 0;

@ -819,15 +705,8 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
 {
  struct grub_fshelp_node *fdiro;
  grub_err_t err;
-  grub_size_t sz;

-  if (grub_add (grub_xfs_fshelp_size(ctx->diro->data), 1, &sz))
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, N_("directory data size overflow"));
-      grub_print_error ();
-      return 0;
-    }
-  fdiro = grub_malloc (sz);
+  fdiro = grub_malloc (grub_xfs_fshelp_size(ctx->diro->data) + 1);
  if (!fdiro)
    {
      grub_print_error ();
@ -843,7 +722,6 @@ static int iterate_dir_call_hook (grub_uint64_t ino, const char *filename,
  if (err)
    {
      grub_print_error ();
-      grub_free (fdiro);
      return 0;
    }

@ -886,20 +764,12 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 	if (iterate_dir_call_hook (parent, "..", &ctx))
 	  return 1;

-	for (i = 0; i < head->count &&
-	     (grub_uint8_t *) de < ((grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data)); i++)
+	for (i = 0; i < head->count; i++)
 	  {
 	    grub_uint64_t ino;
 	    grub_uint8_t *inopos = grub_xfs_inline_de_inopos(dir->data, de);
 	    grub_uint8_t c;

-	    if ((inopos + (smallino ? 4 : 8)) > (grub_uint8_t *) dir + grub_xfs_fshelp_size (dir->data))
-	      {
-		grub_error (GRUB_ERR_BAD_FS, "invalid XFS inode");
-		return 0;
-	      }
-
-
 	    /* inopos might be unaligned.  */
 	    if (smallino)
 	      ino = (((grub_uint32_t) inopos[0]) << 24)
@ -954,49 +824,24 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 	  {
 	    struct grub_xfs_dir2_entry *direntry =
 					grub_xfs_first_de(dir->data, dirblock);
-	    int entries = -1;
-	    char *end = dirblock + dirblk_size;
-	    grub_uint32_t magic;
+	    int entries;
+	    struct grub_xfs_dirblock_tail *tail =
+					grub_xfs_dir_tail(dir->data, dirblock);

 	    numread = grub_xfs_read_file (dir, 0, 0,
 					  blk << dirblk_log2,
 					  dirblk_size, dirblock, 0);
 	    if (numread != dirblk_size)
-	      {
-	        grub_free (dirblock);
-	        return 0;
-	      }
+	      return 0;

-	    /*
-	     * If this data block isn't actually part of the extent list then
-	     * grub_xfs_read_file() returns a block of zeros. So, if the magic
-	     * number field is all zeros then this block should be skipped.
-	     */
-	    magic = *(grub_uint32_t *)(void *) dirblock;
-	    if (!magic)
+	    entries = (grub_be_to_cpu32 (tail->leaf_count)
+		       - grub_be_to_cpu32 (tail->leaf_stale));
+
+	    if (!entries)
 	      continue;

-	    /*
-	     * Leaf and tail information are only in the data block if the number
-	     * of extents is 1.
-	     */
-	    if (grub_xfs_get_inode_nextents (&dir->inode) == 1)
-	      {
-		struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock);
-
-		end = (char *) tail;
-
-		/* Subtract the space used by leaf nodes. */
-		end -= grub_be_to_cpu32 (tail->leaf_count) * sizeof (struct grub_xfs_dir_leaf_entry);
-
-		entries = grub_be_to_cpu32 (tail->leaf_count) - grub_be_to_cpu32 (tail->leaf_stale);
-
-		if (!entries)
-		  continue;
-	      }
-
 	    /* Iterate over all entries within this block.  */
-	    while ((char *) direntry < (char *) end)
+	    while ((char *)direntry < (char *)tail)
 	      {
 		grub_uint8_t *freetag;
 		char *filename;
@ -1016,34 +861,22 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
 		  }

 		filename = (char *)(direntry + 1);
-		if (filename + direntry->len + 1 > (char *) end)
-		  {
-		    grub_error (GRUB_ERR_BAD_FS, "invalid XFS directory entry");
-		    return 0;
-		  }
-
 		/* The byte after the filename is for the filetype, padding, or
 		   tag, which is not used by GRUB.  So it can be overwritten. */
 		filename[direntry->len] = '\0';

-		if (iterate_dir_call_hook (grub_be_to_cpu64(direntry->inode),
+		if (iterate_dir_call_hook (grub_be_to_cpu64(direntry->inode), 
 					   filename, &ctx))
 		  {
 		    grub_free (dirblock);
 		    return 1;
 		  }

-		/*
-		 * The expected number of directory entries is only tracked for the
-		 * single extent case.
-		 */
-		if (grub_xfs_get_inode_nextents (&dir->inode) == 1)
-		  {
-		    /* Check if last direntry in this block is reached. */
-		    entries--;
-		    if (!entries)
-		      break;
-		  }
+		/* Check if last direntry in this block is
+		   reached.  */
+		entries--;
+		if (!entries)
+		  break;

 		/* Select the next directory entry.  */
 		direntry = grub_xfs_next_de(dir->data, direntry);
@ -1066,14 +899,11 @@ static struct grub_xfs_data *
 grub_xfs_mount (grub_disk_t disk)
 {
  struct grub_xfs_data *data = 0;
-  grub_size_t sz;

  data = grub_zalloc (sizeof (struct grub_xfs_data));
  if (!data)
    return 0;

-  data->data_size = sizeof (struct grub_xfs_data);
-
  grub_dprintf("xfs", "Reading sb\n");
  /* Read the superblock.  */
  if (grub_disk_read (disk, 0, 0,
@ -1083,19 +913,14 @@ grub_xfs_mount (grub_disk_t disk)
  if (!grub_xfs_sb_valid(data))
    goto fail;

-  if (grub_xfs_sb_needs_repair (data))
-    grub_dprintf ("xfs", "XFS filesystem needs repair, boot may fail\n");
-
-  if (grub_add (grub_xfs_inode_size (data),
-      sizeof (struct grub_xfs_data) - sizeof (struct grub_xfs_inode) + 1, &sz))
-    goto fail;
-
-  data = grub_realloc (data, sz);
+  data = grub_realloc (data,
+		       sizeof (struct grub_xfs_data)
+		       - sizeof (struct grub_xfs_inode)
+		       + grub_xfs_inode_size(data) + 1);

  if (! data)
    goto fail;

-  data->data_size = sz;
  data->diropen.data = data;
  data->diropen.ino = grub_be_to_cpu64(data->sblock.rootino);
  data->diropen.inode_read = 1;
@ -1106,7 +931,7 @@ grub_xfs_mount (grub_disk_t disk)

  data->disk = disk;
  data->pos = 0;
-  grub_dprintf("xfs", "Reading root ino %" PRIuGRUB_UINT64_T "\n",
+  grub_dprintf("xfs", "Reading root ino %"PRIuGRUB_UINT64_T"\n",
 	       grub_cpu_to_be64(data->sblock.rootino));

  grub_xfs_read_inode (data, data->diropen.ino, &data->diropen.inode);
@ -1114,7 +939,7 @@ grub_xfs_mount (grub_disk_t disk)
  return data;
 fail:

-  if (grub_errno == GRUB_ERR_OUT_OF_RANGE || grub_errno == GRUB_ERR_NONE)
+  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
    grub_error (GRUB_ERR_BAD_FS, "not an XFS filesystem");

  grub_free (data);
@ -1122,6 +947,7 @@ grub_xfs_mount (grub_disk_t disk)
  return 0;
 }

+
 /* Context for grub_xfs_dir.  */
 struct grub_xfs_dir_ctx
 {
@ -1129,27 +955,6 @@ struct grub_xfs_dir_ctx
  void *hook_data;
 };

-/* Bigtime inodes helpers. */
-#define XFS_BIGTIME_EPOCH_OFFSET	(-(grub_int64_t) GRUB_INT32_MIN)
-
-static int grub_xfs_inode_has_bigtime (const struct grub_xfs_inode *inode)
-{
-  return inode->version >= 3 &&
-	 (inode->flags2 & grub_cpu_to_be64_compile_time (XFS_DIFLAG2_BIGTIME));
-}
-
-static grub_int64_t
-grub_xfs_get_inode_time (struct grub_xfs_inode *inode)
-{
-  struct grub_xfs_time_legacy *lts;
-
-  if (grub_xfs_inode_has_bigtime (inode))
-    return grub_divmod64 (grub_be_to_cpu64 (inode->mtime), NSEC_PER_SEC, NULL) - XFS_BIGTIME_EPOCH_OFFSET;
-
-  lts = (struct grub_xfs_time_legacy *) &inode->mtime;
-  return grub_be_to_cpu32 (lts->sec);
-}
-
 /* Helper for grub_xfs_dir.  */
 static int
 grub_xfs_dir_iter (const char *filename, enum grub_fshelp_filetype filetype,
@ -1162,7 +967,7 @@ grub_xfs_dir_iter (const char *filename, enum grub_fshelp_filetype filetype,
  if (node->inode_read)
    {
      info.mtimeset = 1;
-      info.mtime = grub_xfs_get_inode_time (&node->inode);
+      info.mtime = grub_be_to_cpu32 (node->inode.mtime.sec);
    }
  info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
  grub_free (node);
@ -1327,6 +1132,8 @@ grub_xfs_uuid (grub_device_t device, char **uuid)
  return grub_errno;
 }

+
+
 static struct grub_fs grub_xfs_fs =
  {
    .name = "xfs",
@ -1345,7 +1152,6 @@ static struct grub_fs grub_xfs_fs =

 GRUB_MOD_INIT(xfs)
 {
-  //grub_xfs_fs.mod = mod;
  grub_fs_register (&grub_xfs_fs);
  my_mod = mod;
 }
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/zfs/zfs_lz4.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/fs/zfs/zfs_lz4.c
@ -1,285 +0,0 @@
-/*
- * LZ4 - Fast LZ compression algorithm
- * Header File
- * Copyright (C) 2011-2013, Yann Collet.
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * You can contact the author at :
- * - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
- * - LZ4 source repository : http://code.google.com/p/lz4/
- */
-
-#include <grub/err.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/types.h>
-
-int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
-					    int isize, int maxOutputSize);
-
-/*
- * CPU Feature Detection
- */
-
-/* 32 or 64 bits ? */
-#if (GRUB_CPU_SIZEOF_VOID_P == 8)
-#define	LZ4_ARCH64	1
-#else
-#define	LZ4_ARCH64	0
-#endif
-
-/*
- * Compiler Options
- */
-
-
-#define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-
-#if (GCC_VERSION >= 302) || (defined (__INTEL_COMPILER) && __INTEL_COMPILER >= 800) || defined(__clang__)
-#define	expect(expr, value)    (__builtin_expect((expr), (value)))
-#else
-#define	expect(expr, value)    (expr)
-#endif
-
-#define	likely(expr)	expect((expr) != 0, 1)
-#define	unlikely(expr)	expect((expr) != 0, 0)
-
-/* Basic types */
-#define	BYTE	grub_uint8_t
-#define	U16	grub_uint16_t
-#define	U32	grub_uint32_t
-#define	S32	grub_int32_t
-#define	U64	grub_uint64_t
-
-typedef struct _U16_S {
-	U16 v;
-} GRUB_PACKED U16_S;
-typedef struct _U32_S {
-	U32 v;
-} GRUB_PACKED U32_S;
-typedef struct _U64_S {
-	U64 v;
-} GRUB_PACKED U64_S;
-
-#define	A64(x)	(((U64_S *)(x))->v)
-#define	A32(x)	(((U32_S *)(x))->v)
-#define	A16(x)	(((U16_S *)(x))->v)
-
-/*
- * Constants
- */
-#define	MINMATCH 4
-
-#define	COPYLENGTH 8
-#define	LASTLITERALS 5
-
-#define	ML_BITS 4
-#define	ML_MASK ((1U<<ML_BITS)-1)
-#define	RUN_BITS (8-ML_BITS)
-#define	RUN_MASK ((1U<<RUN_BITS)-1)
-
-/*
- * Architecture-specific macros
- */
-#if LZ4_ARCH64
-#define	STEPSIZE 8
-#define	UARCH U64
-#define	AARCH A64
-#define	LZ4_COPYSTEP(s, d)	A64(d) = A64(s); d += 8; s += 8;
-#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d)
-#define	LZ4_SECURECOPY(s, d, e)	if (d < e) LZ4_WILDCOPY(s, d, e)
-#define	HTYPE U32
-#define	INITBASE(base)		const BYTE* const base = ip
-#else
-#define	STEPSIZE 4
-#define	UARCH U32
-#define	AARCH A32
-#define	LZ4_COPYSTEP(s, d)	A32(d) = A32(s); d += 4; s += 4;
-#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d); LZ4_COPYSTEP(s, d);
-#define	LZ4_SECURECOPY		LZ4_WILDCOPY
-#define	HTYPE const BYTE*
-#define	INITBASE(base)		const int base = 0
-#endif
-
-#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) { d = (s) - grub_le_to_cpu16 (A16 (p)); }
-#define	LZ4_WRITE_LITTLEENDIAN_16(p, v)  { A16(p) = grub_cpu_to_le16 (v); p += 2; }
-
-/* Macros */
-#define	LZ4_WILDCOPY(s, d, e) do { LZ4_COPYPACKET(s, d) } while (d < e);
-
-/* Decompression functions */
-grub_err_t
-lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len);
-
-grub_err_t
-lz4_decompress(void *s_start, void *d_start, grub_size_t s_len, grub_size_t d_len)
-{
-	const BYTE *src = s_start;
-	U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
-	    src[3];
-
-	/* invalid compressed buffer size encoded at start */
-	if (bufsiz + 4 > s_len)
-		return grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed.");
-
-	/*
-	 * Returns 0 on success (decompression function returned non-negative)
-	 * and appropriate error on failure (decompression function returned negative).
-	 */
-	return (LZ4_uncompress_unknownOutputSize((char*)s_start + 4, d_start, bufsiz,
-	    d_len) < 0)?grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed."):0;
-}
-
-int
-LZ4_uncompress_unknownOutputSize(const char *source,
-    char *dest, int isize, int maxOutputSize)
-{
-	/* Local Variables */
-	const BYTE * ip = (const BYTE *) source;
-	const BYTE *const iend = ip + isize;
-	const BYTE * ref;
-
-	BYTE * op = (BYTE *) dest;
-	BYTE *const oend = op + maxOutputSize;
-	BYTE *cpy;
-
-	grub_size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
-
-	/* Main Loop */
-	while (ip < iend) {
-		BYTE token;
-		int length;
-
-		/* get runlength */
-		token = *ip++;
-		if ((length = (token >> ML_BITS)) == RUN_MASK) {
-			int s = 255;
-			while ((ip < iend) && (s == 255)) {
-				s = *ip++;
-				length += s;
-			}
-		}
-		/* copy literals */
-		if ((grub_addr_t) length > ~(grub_addr_t)op)
-		  goto _output_error;
-		cpy = op + length;
-		if ((cpy > oend - COPYLENGTH) ||
-		    (ip + length > iend - COPYLENGTH)) {
-			if (cpy > oend)
-				/*
-				 * Error: request to write beyond destination
-				 * buffer.
-				 */
-				goto _output_error;
-			if (ip + length > iend)
-				/*
-				 * Error : request to read beyond source
-				 * buffer.
-				 */
-				goto _output_error;
-			grub_memcpy(op, ip, length);
-			op += length;
-			ip += length;
-			if (ip < iend)
-				/* Error : LZ4 format violation */
-				goto _output_error;
-			/* Necessarily EOF, due to parsing restrictions. */
-			break;
-		}
-		LZ4_WILDCOPY(ip, op, cpy);
-		ip -= (op - cpy);
-		op = cpy;
-
-		/* get offset */
-		LZ4_READ_LITTLEENDIAN_16(ref, cpy, ip);
-		ip += 2;
-		if (ref < (BYTE * const) dest)
-			/*
-			 * Error: offset creates reference outside of
-			 * destination buffer.
-			 */
-			goto _output_error;
-
-		/* get matchlength */
-		if ((length = (token & ML_MASK)) == ML_MASK) {
-			while (ip < iend) {
-				int s = *ip++;
-				length += s;
-				if (s == 255)
-					continue;
-				break;
-			}
-		}
-		/* copy repeated sequence */
-		if unlikely(op - ref < STEPSIZE) {
-#if LZ4_ARCH64
-			grub_size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
-			grub_size_t dec2 = dec2table[op - ref];
-#else
-			const int dec2 = 0;
-#endif
-			*op++ = *ref++;
-			*op++ = *ref++;
-			*op++ = *ref++;
-			*op++ = *ref++;
-			ref -= dec[op - ref];
-			A32(op) = A32(ref);
-			op += STEPSIZE - 4;
-			ref -= dec2;
-		} else {
-			LZ4_COPYSTEP(ref, op);
-		}
-		cpy = op + length - (STEPSIZE - 4);
-		if (cpy > oend - COPYLENGTH) {
-			if (cpy > oend)
-				/*
-				 * Error: request to write outside of
-				 * destination buffer.
-				 */
-				goto _output_error;
-			LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
-			while (op < cpy)
-				*op++ = *ref++;
-			op = cpy;
-			if (op == oend)
-				/*
-				 * Check EOF (should never happen, since last
-				 * 5 bytes are supposed to be literals).
-				 */
-				break;
-			continue;
-		}
-		LZ4_SECURECOPY(ref, op, cpy);
-		op = cpy;	/* correction */
-	}
-
-	/* end of decoding */
-	return (int)(((char *)op) - dest);
-
-	/* write overflow error detected */
-	_output_error:
-	return (int)(-(((char *)ip) - source));
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gfxmenu.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gfxmenu.c
@ -119,8 +119,6 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
  view->menu = menu;
  view->nested = nested;
  view->first_timeout = -1;
-  if (menu->size)
-    view->menu_title_offset = grub_zalloc (sizeof (*view->menu_title_offset) * menu->size);

  grub_video_set_viewport (0, 0, mode_info.width, mode_info.height);
  if (view->double_repaint)
@ -136,8 +134,6 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
  instance->fini = grub_gfxmenu_viewer_fini;
  instance->print_timeout = grub_gfxmenu_print_timeout;
  instance->clear_timeout = grub_gfxmenu_clear_timeout;
-  if (view->menu_title_offset)
-    instance->scroll_chosen_entry = grub_gfxmenu_scroll_chosen_entry;

  grub_menu_register_viewer (instance);

--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_label.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_label.c
@ -31,7 +31,6 @@ extern int g_ventoy_iso_raw;
 extern int g_ventoy_grub2_mode;
 extern int g_ventoy_wimboot_mode;
 extern int g_ventoy_iso_uefi_drv;
-extern char g_ventoy_hotkey_tip[256];

 static const char *align_options[] =
 {
@ -60,15 +59,11 @@ struct grub_gui_label
  grub_font_t font;
  grub_video_rgba_color_t color;
  int value;
-  int vtoytip;
  enum align_mode align;
 };

 typedef struct grub_gui_label *grub_gui_label_t;

-extern const char * g_ventoy_tip_msg1;
-extern const char * g_ventoy_tip_msg2;
-
 static void
 label_destroy (void *vself)
 {
@ -95,7 +90,6 @@ label_is_instance (void *vself __attribute__((unused)), const char *type)
 static void
 label_paint (void *vself, const grub_video_rect_t *region)
 {
-  const char *text;
  grub_gui_label_t self = vself;

  if (! self->visible)
@ -104,24 +98,16 @@ label_paint (void *vself, const grub_video_rect_t *region)
  if (!grub_video_have_common_points (region, &self->bounds))
    return;

-  if (self->vtoytip == 1) {
-     text = g_ventoy_tip_msg1 ? g_ventoy_tip_msg1 : "";
-  } else if (self->vtoytip == 2) {
-     text = g_ventoy_tip_msg2 ? g_ventoy_tip_msg2 : "";
-  } else {
-     text = self->text;
-  }
-
  /* Calculate the starting x coordinate.  */
  int left_x;
  if (self->align == align_left)
    left_x = 0;
  else if (self->align == align_center)
    left_x = (self->bounds.width
-	      - grub_font_get_string_width (self->font, text)) / 2;
+	      - grub_font_get_string_width (self->font, self->text)) / 2;
  else if (self->align == align_right)
    left_x = (self->bounds.width
-              - grub_font_get_string_width (self->font, text));
+              - grub_font_get_string_width (self->font, self->text));
  else
    return;   /* Invalid alignment.  */

@ -130,7 +116,7 @@ label_paint (void *vself, const grub_video_rect_t *region)

  grub_video_rect_t vpsave;
  grub_gui_set_viewport (&self->bounds, &vpsave);
-  grub_font_draw_string (text,
+  grub_font_draw_string (self->text,
                         self->font,
                         grub_video_map_rgba_color (self->color),
                         left_x,
@ -170,8 +156,8 @@ static void
 label_get_minimal_size (void *vself, unsigned *width, unsigned *height)
 {
  grub_gui_label_t self = vself;
-   *width = grub_font_get_string_width (self->font, self->text);
-   *height = (grub_font_get_ascent (self->font)
+  *width = grub_font_get_string_width (self->font, self->text);
+  *height = (grub_font_get_ascent (self->font)
             + grub_font_get_descent (self->font));
 }

@ -231,11 +217,10 @@ label_set_property (void *vself, const char *name, const char *value)
            value = g_ventoy_iso_uefi_drv ? grub_env_get("VTOY_ISO_UEFI_DRV_STR") : " ";
       }
       else if (grub_strcmp (value, "@VTOY_HOTKEY_TIP@") == 0) {
-            value = g_ventoy_hotkey_tip;
-       } else if (value[0] == '@' && value[1] == '@' && value[2]) {
-            value = grub_env_get(value + 2);
-            if (!value)
-                value = " ";
+            value = grub_env_get("VTOY_HOTKEY_TIP");
+            if (value == NULL) {
+                value = _(" ");
+            }
       }
       
 	  self->template = grub_strdup (value);
@ -270,14 +255,8 @@ label_set_property (void *vself, const char *name, const char *value)
    {
      grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
      grub_free (self->id);
-      if (value) {
+      if (value)
        self->id = grub_strdup (value);
-        if (grub_strcmp(value, "VTOY_MENU_TIP_1") == 0) {
-            self->vtoytip = 1;
-        } else if (grub_strcmp(value, "VTOY_MENU_TIP_2") == 0) {
-            self->vtoytip = 2;
-        }
-      }
      else
        self->id = 0;
      if (self->id && grub_strcmp (self->id, GRUB_GFXMENU_TIMEOUT_COMPONENT_ID)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_list.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_list.c
@ -1,961 +0,0 @@
-/* gui_list.c - GUI component to display a selectable list of items.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/gui.h>
-#include <grub/gui_string_util.h>
-#include <grub/gfxmenu_view.h>
-#include <grub/gfxwidgets.h>
-#include <grub/color.h>
-#include <grub/charset.h>
-
-enum scrollbar_slice_mode {
-  SCROLLBAR_SLICE_WEST,
-  SCROLLBAR_SLICE_CENTER,
-  SCROLLBAR_SLICE_EAST
-};
-
-struct grub_gui_list_impl
-{
-  struct grub_gui_list list;
-
-  grub_gui_container_t parent;
-  grub_video_rect_t bounds;
-  char *id;
-  int visible;
-
-  int icon_width;
-  int icon_height;
-  int item_height;
-  int item_padding;
-  int item_icon_space;
-  int item_spacing;
-  grub_font_t item_font;
-  int selected_item_font_inherit;
-  grub_font_t selected_item_font;
-  grub_video_rgba_color_t item_color;
-  int selected_item_color_inherit;
-  grub_video_rgba_color_t selected_item_color;
-
-  int draw_scrollbar;
-  int need_to_recreate_scrollbar;
-  char *scrollbar_frame_pattern;
-  char *scrollbar_thumb_pattern;
-  grub_gfxmenu_box_t scrollbar_frame;
-  grub_gfxmenu_box_t scrollbar_thumb;
-  int scrollbar_thumb_overlay;
-  int scrollbar_width;
-  enum scrollbar_slice_mode scrollbar_slice;
-  int scrollbar_left_pad;
-  int scrollbar_right_pad;
-  int scrollbar_top_pad;
-  int scrollbar_bottom_pad;
-
-  int first_shown_index;
-
-  int need_to_recreate_boxes;
-  char *theme_dir;
-  char *menu_box_pattern;
-  char *item_box_pattern;
-  int selected_item_box_pattern_inherit;
-  char *selected_item_box_pattern;
-  grub_gfxmenu_box_t menu_box;
-  grub_gfxmenu_box_t selected_item_box;
-  grub_gfxmenu_box_t item_box;
-
-  grub_gfxmenu_icon_manager_t icon_manager;
-
-  grub_gfxmenu_view_t view;
-};
-
-typedef struct grub_gui_list_impl *list_impl_t;
-
-static void
-list_destroy (void *vself)
-{
-  list_impl_t self = vself;
-
-  grub_free (self->theme_dir);
-  grub_free (self->menu_box_pattern);
-  grub_free (self->item_box_pattern);
-  grub_free (self->selected_item_box_pattern);
-  if (self->menu_box)
-    self->menu_box->destroy (self->menu_box);
-  if (self->item_box)
-    self->item_box->destroy (self->item_box);
-  if (self->selected_item_box)
-    self->selected_item_box->destroy (self->selected_item_box);
-  if (self->icon_manager)
-    grub_gfxmenu_icon_manager_destroy (self->icon_manager);
-  if (self->scrollbar_thumb)
-    self->scrollbar_thumb->destroy (self->scrollbar_thumb);
-  if (self->scrollbar_frame)
-    self->scrollbar_frame->destroy (self->scrollbar_frame);
-  grub_free (self->scrollbar_thumb_pattern);
-  grub_free (self->scrollbar_frame_pattern);
-  grub_free (self);
-}
-
-static int
-get_num_shown_items (list_impl_t self)
-{
-  int boxpad = self->item_padding;
-  int item_vspace = self->item_spacing;
-  int item_height = self->item_height;
-  
-  grub_gfxmenu_box_t box = self->menu_box;
-  int box_top_pad = box->get_top_pad (box);
-  int box_bottom_pad = box->get_bottom_pad (box);
-  grub_gfxmenu_box_t itembox = self->item_box;
-  grub_gfxmenu_box_t selbox = self->selected_item_box;
-  int item_top_pad = itembox->get_top_pad (itembox);
-  int item_bottom_pad = itembox->get_bottom_pad (itembox);
-  int sel_top_pad = selbox->get_top_pad (selbox);
-  int sel_bottom_pad = selbox->get_bottom_pad (selbox);
-  int max_top_pad = grub_max (item_top_pad, sel_top_pad);
-  int max_bottom_pad = grub_max (item_bottom_pad, sel_bottom_pad);
-
-  if (item_height + item_vspace <= 0)
-    return 1;
-
-  return (self->bounds.height + item_vspace - 2 * boxpad
-          - max_top_pad - max_bottom_pad
-          - box_top_pad - box_bottom_pad) / (item_height + item_vspace);
-}
-
-static int
-check_boxes (list_impl_t self)
-{
-  if (self->need_to_recreate_boxes)
-    {
-      grub_gui_recreate_box (&self->menu_box,
-                             self->menu_box_pattern,
-                             self->theme_dir);
-
-      grub_gui_recreate_box (&self->item_box,
-                             self->item_box_pattern,
-                             self->theme_dir);
-
-      grub_gui_recreate_box (&self->selected_item_box,
-                             self->selected_item_box_pattern,
-                             self->theme_dir);
-
-      self->need_to_recreate_boxes = 0;
-    }
-
-  return (self->menu_box != 0 && self->selected_item_box != 0
-          && self->item_box != 0);
-}
-
-static int
-check_scrollbar (list_impl_t self)
-{
-  if (self->need_to_recreate_scrollbar)
-    {
-      grub_gui_recreate_box (&self->scrollbar_frame,
-                             self->scrollbar_frame_pattern,
-                             self->theme_dir);
-
-      grub_gui_recreate_box (&self->scrollbar_thumb,
-                             self->scrollbar_thumb_pattern,
-                             self->theme_dir);
-
-      self->need_to_recreate_scrollbar = 0;
-    }
-
-  if (self->scrollbar_frame == 0 || self->scrollbar_thumb == 0)
-    return 0;
-
-  /* Sanity checks. */
-  grub_gfxmenu_box_t frame = self->scrollbar_frame;
-  grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
-  grub_gfxmenu_box_t menu = self->menu_box;
-  int min_width = frame->get_left_pad (frame)
-                  + frame->get_right_pad (frame);
-  int min_height = frame->get_top_pad (frame)
-                   + frame->get_bottom_pad (frame)
-                   + self->scrollbar_top_pad + self->scrollbar_bottom_pad
-                   + menu->get_top_pad (menu)
-                   + menu->get_bottom_pad (menu);
-  if (!self->scrollbar_thumb_overlay)
-    {
-      min_width += thumb->get_left_pad (thumb)
-                   + thumb->get_right_pad (thumb);
-      min_height += thumb->get_top_pad (thumb)
-                    + thumb->get_bottom_pad (thumb);
-    }
-  if (min_width <= self->scrollbar_width
-      && min_height <= (int) self->bounds.height)
-    return 1;
-
-  /* Unprintable dimenstions. */
-  self->draw_scrollbar = 0;
-  return 0;
-}
-
-static const char *
-list_get_id (void *vself)
-{
-  list_impl_t self = vself;
-  return self->id;
-}
-
-static int
-list_is_instance (void *vself __attribute__((unused)), const char *type)
-{
-  return (grub_strcmp (type, "component") == 0
-          || grub_strcmp (type, "list") == 0);
-}
-
-static struct grub_video_bitmap *
-get_item_icon (list_impl_t self, int item_index)
-{
-  grub_menu_entry_t entry;
-  entry = grub_menu_get_entry (self->view->menu, item_index);
-  if (! entry)
-    return 0;
-
-  return grub_gfxmenu_icon_manager_get_icon (self->icon_manager, entry);
-}
-
-static void
-make_selected_item_visible (list_impl_t self)
-{
-  int selected_index = self->view->selected;
-  if (selected_index < 0)
-    return;   /* No item is selected.  */
-  int num_shown_items = get_num_shown_items (self);
-  int last_shown_index = self->first_shown_index + (num_shown_items - 1);
-  if (selected_index < self->first_shown_index)
-    self->first_shown_index = selected_index;
-  else if (selected_index > last_shown_index)
-    self->first_shown_index = selected_index - (num_shown_items - 1);
-}
-
-/* Draw a scrollbar on the menu.  */
-static void
-draw_scrollbar (list_impl_t self,
-                int value, int extent, int min, int max,
-                int scrollbar_width, int scrollbar_height)
-{
-  unsigned thumby, thumbheight;
-
-  grub_gfxmenu_box_t frame = self->scrollbar_frame;
-  grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
-  int frame_vertical_pad = (frame->get_top_pad (frame)
-                            + frame->get_bottom_pad (frame));
-  int frame_horizontal_pad = (frame->get_left_pad (frame)
-                              + frame->get_right_pad (frame));
-  unsigned thumb_vertical_pad = (thumb->get_top_pad (thumb)
-				 + thumb->get_bottom_pad (thumb));
-  int thumb_horizontal_pad = (thumb->get_left_pad (thumb)
-                              + thumb->get_right_pad (thumb));
-  int tracktop = frame->get_top_pad (frame);
-  unsigned tracklen;
-  if (scrollbar_height <= frame_vertical_pad)
-    tracklen = 0;
-  else
-    tracklen = scrollbar_height - frame_vertical_pad;
-  frame->set_content_size (frame,
-                           scrollbar_width - frame_horizontal_pad,
-                           tracklen);
-  if (self->scrollbar_thumb_overlay)
-    {
-      tracklen += thumb_vertical_pad;
-      tracktop -= thumb->get_top_pad (thumb);
-    }
-  if (value <= min || max <= min)
-    thumby = 0;
-  else
-    thumby = ((unsigned) tracklen * (value - min))
-      / ((unsigned) (max - min));
-  if (max <= min)
-    thumbheight = 1;
-  else
-    thumbheight = ((unsigned) (tracklen * extent)
-		   / ((unsigned) (max - min))) + 1;
-  /* Rare occasion: too many entries or too low height. */
-  if (thumbheight < thumb_vertical_pad)
-    {
-      thumbheight = thumb_vertical_pad;
-      if (value <= min || max <= extent
-	  || tracklen <= thumb_vertical_pad)
-	thumby = 0;
-      else
-	thumby = ((unsigned) ((tracklen - thumb_vertical_pad) * (value - min))
-		  / ((unsigned)(max - extent)));
-    }
-  thumby += tracktop;
-  int thumbx = frame->get_left_pad (frame);
-  int thumbwidth = scrollbar_width - frame_horizontal_pad;
-  if (!self->scrollbar_thumb_overlay)
-    thumbwidth -= thumb_horizontal_pad;
-  else
-    thumbx -= thumb->get_left_pad (thumb);
-  thumb->set_content_size (thumb, thumbwidth,
-                           thumbheight - thumb_vertical_pad);
-  frame->draw (frame, 0, 0);
-  thumb->draw (thumb, thumbx, thumby);
-}
-
-/* Draw the list of items.  */
-static void
-draw_menu (list_impl_t self, int num_shown_items)
-{
-  if (! self->menu_box || ! self->selected_item_box || ! self->item_box)
-    return;
-
-  int boxpad = self->item_padding;
-  int icon_text_space = self->item_icon_space;
-  int item_vspace = self->item_spacing;
-
-  int ascent = grub_font_get_ascent (self->item_font);
-  int descent = grub_font_get_descent (self->item_font);
-  int selected_ascent = grub_font_get_ascent (self->selected_item_font);
-  int selected_descent = grub_font_get_descent (self->selected_item_font);
-  int text_box_height = self->item_height;
-
-  make_selected_item_visible (self);
-
-  grub_gfxmenu_box_t itembox = self->item_box;
-  grub_gfxmenu_box_t selbox = self->selected_item_box;
-  int item_leftpad = itembox->get_left_pad (itembox);
-  int item_rightpad = itembox->get_right_pad (itembox);
-  int item_border_width = item_leftpad + item_rightpad;
-  int item_toppad = itembox->get_top_pad (itembox);
-  int sel_leftpad = selbox->get_left_pad (selbox);
-  int sel_rightpad = selbox->get_right_pad (selbox);
-  int sel_border_width = sel_leftpad + sel_rightpad;
-  int sel_toppad = selbox->get_top_pad (selbox);
-
-  int max_leftpad = grub_max (item_leftpad, sel_leftpad);
-  int max_toppad = grub_max (item_toppad, sel_toppad);
-  int item_top = 0;
-  int menu_index;
-  int visible_index;
-  struct grub_video_rect oviewport;
-
-  grub_video_get_viewport (&oviewport.x, &oviewport.y,
-			   &oviewport.width, &oviewport.height);
-  grub_video_set_viewport (oviewport.x + boxpad, 
-			   oviewport.y + boxpad,
-			   oviewport.width - 2 * boxpad,
-			   oviewport.height - 2 * boxpad);
-
-  int cwidth = oviewport.width - 2 * boxpad;
-
-  itembox->set_content_size (itembox, cwidth - item_border_width,
-                             text_box_height);
-  selbox->set_content_size (selbox, cwidth - sel_border_width,
-                            text_box_height);
-
-  int text_left_offset = self->icon_width + icon_text_space;
-  int item_text_top_offset = (text_box_height - (ascent + descent)) / 2 + ascent;
-  int sel_text_top_offset = (text_box_height - (selected_ascent
-                                                + selected_descent)) / 2
-                                 + selected_ascent;
-
-  grub_video_rect_t svpsave, sviewport;
-  sviewport.x = max_leftpad + text_left_offset;
-  int text_viewport_width = cwidth - sviewport.x;
-  sviewport.height = text_box_height;
-
-  grub_video_color_t item_color;
-  grub_video_color_t sel_color;
-  item_color = grub_video_map_rgba_color (self->item_color);
-  sel_color = grub_video_map_rgba_color (self->selected_item_color);
-
-  int item_box_top_offset = max_toppad - item_toppad;
-  int sel_box_top_offset = max_toppad - sel_toppad;
-  int item_viewport_width = text_viewport_width - item_rightpad;
-  int sel_viewport_width = text_viewport_width - sel_rightpad;
-  int tmp_icon_top_offset = (text_box_height - self->icon_height) / 2;
-  int item_icon_top_offset = item_toppad + tmp_icon_top_offset;
-  int sel_icon_top_offset = sel_toppad + tmp_icon_top_offset;
-
-  for (visible_index = 0, menu_index = self->first_shown_index;
-       visible_index < num_shown_items && menu_index < self->view->menu->size;
-       visible_index++, menu_index++)
-    {
-      int is_selected = (menu_index == self->view->selected);
-      struct grub_video_bitmap *icon;
-      grub_font_t font;
-      grub_video_color_t color;
-      int text_top_offset;
-      int top_pad;
-      int icon_top_offset;
-      int viewport_width;
-
-      if (is_selected)
-        {
-          selbox->draw (selbox, 0, item_top + sel_box_top_offset);
-          font = self->selected_item_font;
-          color = sel_color;
-          text_top_offset = sel_text_top_offset;
-          top_pad = sel_toppad;
-          icon_top_offset = sel_icon_top_offset;
-          viewport_width = sel_viewport_width;
-        }
-      else
-        {
-          itembox->draw (itembox, 0, item_top + item_box_top_offset);
-          font = self->item_font;
-          color = item_color;
-          text_top_offset = item_text_top_offset;
-          top_pad = item_toppad;
-          icon_top_offset = item_icon_top_offset;
-          viewport_width = item_viewport_width;
-        }
-
-      icon = get_item_icon (self, menu_index);
-      if (icon != 0)
-        grub_video_blit_bitmap (icon, GRUB_VIDEO_BLIT_BLEND,
-                                max_leftpad,
-                                item_top + icon_top_offset,
-                                0, 0, self->icon_width, self->icon_height);
-
-      const char *item_title =
-        grub_menu_get_entry (self->view->menu, menu_index)->title;
-
-
-      int off = self->view->menu_title_offset[menu_index];
-      const char *scrolled_title =
-        grub_utf8_offset_code (item_title, grub_strlen (item_title), off);
-      if (scrolled_title)
-        item_title = scrolled_title;
-
-      sviewport.y = item_top + top_pad;
-      sviewport.width = viewport_width;
-      grub_gui_set_viewport (&sviewport, &svpsave);
-      grub_font_draw_string (item_title,
-                             font,
-                             color,
-                             0,
-                             text_top_offset);
-      grub_gui_restore_viewport (&svpsave);
-
-      item_top += text_box_height + item_vspace;
-    }
-  grub_video_set_viewport (oviewport.x,
-			   oviewport.y,
-			   oviewport.width,
-			   oviewport.height);
-}
-
-static void
-list_paint (void *vself, const grub_video_rect_t *region)
-{
-  list_impl_t self = vself;
-  grub_video_rect_t vpsave;
-
-  if (! self->visible)
-    return;
-  if (!grub_video_have_common_points (region, &self->bounds))
-    return;
-
-  check_boxes (self);
-
-  if (! self->menu_box || ! self->selected_item_box || ! self->item_box)
-    return;
-
-  grub_gui_set_viewport (&self->bounds, &vpsave);
-  {
-    grub_gfxmenu_box_t box = self->menu_box;
-    int box_left_pad = box->get_left_pad (box);
-    int box_top_pad = box->get_top_pad (box);
-    int box_right_pad = box->get_right_pad (box);
-    int box_bottom_pad = box->get_bottom_pad (box);
-    grub_video_rect_t vpsave2, content_rect;
-    int num_shown_items = get_num_shown_items (self);
-    int drawing_scrollbar = (self->draw_scrollbar
-			     && (num_shown_items < self->view->menu->size)
-			     && check_scrollbar (self));
-    int scrollbar_width = self->scrollbar_width;
-
-    content_rect.x = box_left_pad;
-    content_rect.y = box_top_pad;
-    content_rect.width = self->bounds.width - box_left_pad - box_right_pad;
-    content_rect.height = self->bounds.height - box_top_pad - box_bottom_pad;
-
-    box->set_content_size (box, content_rect.width, content_rect.height);
-
-    box->draw (box, 0, 0);
-
-    switch (self->scrollbar_slice)
-      {
-        case SCROLLBAR_SLICE_WEST:
-          content_rect.x += self->scrollbar_right_pad;
-          content_rect.width -= self->scrollbar_right_pad;
-          break;
-        case SCROLLBAR_SLICE_CENTER:
-          if (drawing_scrollbar)
-            content_rect.width -= scrollbar_width + self->scrollbar_left_pad
-                                  + self->scrollbar_right_pad;
-          break;
-        case SCROLLBAR_SLICE_EAST:
-          content_rect.width -= self->scrollbar_left_pad;
-          break;
-      }
-
-    grub_gui_set_viewport (&content_rect, &vpsave2);
-    draw_menu (self, num_shown_items);
-    grub_gui_restore_viewport (&vpsave2);
-
-    if (drawing_scrollbar)
-      {
-        content_rect.y += self->scrollbar_top_pad;
-        content_rect.height -= self->scrollbar_top_pad
-                               + self->scrollbar_bottom_pad;
-        content_rect.width = scrollbar_width;
-        switch (self->scrollbar_slice)
-          {
-            case SCROLLBAR_SLICE_WEST:
-              if (box_left_pad > scrollbar_width)
-                {
-                  content_rect.x = box_left_pad - scrollbar_width;
-                  content_rect.width = scrollbar_width;
-                }
-              else
-                {
-                  content_rect.x = 0;
-                  content_rect.width = box_left_pad;
-                }
-              break;
-            case SCROLLBAR_SLICE_CENTER:
-              content_rect.x = self->bounds.width - box_right_pad
-                               - scrollbar_width - self->scrollbar_right_pad;
-              content_rect.width = scrollbar_width;
-              break;
-            case SCROLLBAR_SLICE_EAST:
-              content_rect.x = self->bounds.width - box_right_pad;
-              content_rect.width = box_right_pad;
-              break;
-          }
-
-        grub_gui_set_viewport (&content_rect, &vpsave2);
-        draw_scrollbar (self,
-                        self->first_shown_index, num_shown_items,
-                        0, self->view->menu->size,
-                        scrollbar_width,
-                        content_rect.height);
-        grub_gui_restore_viewport (&vpsave2);
-      }
-  }
-
-  grub_gui_restore_viewport (&vpsave);
-}
-
-static void
-list_set_parent (void *vself, grub_gui_container_t parent)
-{
-  list_impl_t self = vself;
-  self->parent = parent;
-}
-
-static grub_gui_container_t
-list_get_parent (void *vself)
-{
-  list_impl_t self = vself;
-  return self->parent;
-}
-
-static void
-list_set_bounds (void *vself, const grub_video_rect_t *bounds)
-{
-  list_impl_t self = vself;
-  self->bounds = *bounds;
-}
-
-static void
-list_get_bounds (void *vself, grub_video_rect_t *bounds)
-{
-  list_impl_t self = vself;
-  *bounds = self->bounds;
-}
-
-static void
-list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
-{
-  list_impl_t self = vself;
-
-  if (check_boxes (self))
-    {
-      int boxpad = self->item_padding;
-      int item_vspace = self->item_spacing;
-      int item_height = self->item_height;
-      int num_items = 3;
-
-      grub_gfxmenu_box_t box = self->menu_box;
-      int box_left_pad = box->get_left_pad (box);
-      int box_top_pad = box->get_top_pad (box);
-      int box_right_pad = box->get_right_pad (box);
-      int box_bottom_pad = box->get_bottom_pad (box);
-      unsigned width_s;
-
-      grub_gfxmenu_box_t selbox = self->selected_item_box;
-      int sel_top_pad = selbox->get_top_pad (selbox);
-      int sel_bottom_pad = selbox->get_bottom_pad (selbox);
-      int sel_left_pad = selbox->get_left_pad (selbox);
-      int sel_right_pad = selbox->get_right_pad (selbox);
-
-      grub_gfxmenu_box_t itembox = self->item_box;
-      int item_top_pad = itembox->get_top_pad (itembox);
-      int item_bottom_pad = itembox->get_bottom_pad (itembox);
-      int item_left_pad = itembox->get_left_pad (itembox);
-      int item_right_pad = itembox->get_right_pad (itembox);
-
-      int max_left_pad = grub_max (item_left_pad, sel_left_pad);
-      int max_right_pad = grub_max (item_right_pad, sel_right_pad);
-      int max_top_pad = grub_max (item_top_pad, sel_top_pad);
-      int max_bottom_pad = grub_max (item_bottom_pad, sel_bottom_pad);
-
-      *width = grub_font_get_string_width (self->item_font, "Typical OS");
-      width_s = grub_font_get_string_width (self->selected_item_font,
-					    "Typical OS");
-      if (*width < width_s)
-	*width = width_s;
-
-      *width += 2 * boxpad + box_left_pad + box_right_pad
-                + max_left_pad + max_right_pad
-                + self->item_icon_space + self->icon_width;
-
-      switch (self->scrollbar_slice)
-        {
-          case SCROLLBAR_SLICE_WEST:
-            *width += self->scrollbar_right_pad;
-            break;
-          case SCROLLBAR_SLICE_CENTER:
-            *width += self->scrollbar_width + self->scrollbar_left_pad
-                      + self->scrollbar_right_pad;
-            break;
-          case SCROLLBAR_SLICE_EAST:
-            *width += self->scrollbar_left_pad;
-            break;
-        }
-
-      /* Set the menu box height to fit the items.  */
-      *height = (item_height * num_items
-                 + item_vspace * (num_items - 1)
-                 + 2 * boxpad
-                 + box_top_pad + box_bottom_pad
-                 + max_top_pad + max_bottom_pad);
-    }
-  else
-    {
-      *width = 0;
-      *height = 0;
-    }
-}
-
-static grub_err_t
-list_set_property (void *vself, const char *name, const char *value)
-{
-  list_impl_t self = vself;
-  if (grub_strcmp (name, "item_font") == 0)
-    {
-      self->item_font = grub_font_get (value);
-      if (self->selected_item_font_inherit)
-        self->selected_item_font = self->item_font;
-    }
-  else if (grub_strcmp (name, "selected_item_font") == 0)
-    {
-      if (! value || grub_strcmp (value, "inherit") == 0)
-        {
-          self->selected_item_font = self->item_font;
-          self->selected_item_font_inherit = 1;
-        }
-      else
-        {
-          self->selected_item_font = grub_font_get (value);
-          self->selected_item_font_inherit = 0;
-        }
-    }
-  else if (grub_strcmp (name, "item_color") == 0)
-    {
-      grub_video_rgba_color_t color;
-      if (grub_video_parse_color (value, &color) == GRUB_ERR_NONE)
-        {
-          self->item_color = color;
-          if (self->selected_item_color_inherit)
-            self->selected_item_color = self->item_color;
-        }
-    }
-  else if (grub_strcmp (name, "selected_item_color") == 0)
-    {
-      if (! value || grub_strcmp (value, "inherit") == 0)
-        {
-          self->selected_item_color = self->item_color;
-          self->selected_item_color_inherit = 1;
-        }
-      else
-        {
-          grub_video_rgba_color_t color;
-          if (grub_video_parse_color (value, &color)
-              == GRUB_ERR_NONE)
-            {
-              self->selected_item_color = color;
-              self->selected_item_color_inherit = 0;
-            }
-        }
-    }
-  else if (grub_strcmp (name, "icon_width") == 0)
-    {
-      self->icon_width = grub_strtol (value, 0, 10);
-      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
-                                               self->icon_width,
-                                               self->icon_height);
-    }
-  else if (grub_strcmp (name, "icon_height") == 0)
-    {
-      self->icon_height = grub_strtol (value, 0, 10);
-      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
-                                               self->icon_width,
-                                               self->icon_height);
-    }
-  else if (grub_strcmp (name, "item_height") == 0)
-    {
-      self->item_height = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "item_padding") == 0)
-    {
-      self->item_padding = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "item_icon_space") == 0)
-    {
-      self->item_icon_space = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "item_spacing") == 0)
-    {
-      self->item_spacing = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "visible") == 0)
-    {
-      self->visible = grub_strcmp (value, "false") != 0;
-    }
-  else if (grub_strcmp (name, "menu_pixmap_style") == 0)
-    {
-      self->need_to_recreate_boxes = 1;
-      grub_free (self->menu_box_pattern);
-      self->menu_box_pattern = value ? grub_strdup (value) : 0;
-    }
-  else if (grub_strcmp (name, "item_pixmap_style") == 0)
-    {
-      self->need_to_recreate_boxes = 1;
-      grub_free (self->item_box_pattern);
-      self->item_box_pattern = value ? grub_strdup (value) : 0;
-      if (self->selected_item_box_pattern_inherit)
-        {
-          grub_free (self->selected_item_box_pattern);
-          self->selected_item_box_pattern = value ? grub_strdup (value) : 0;
-        }
-    }
-  else if (grub_strcmp (name, "selected_item_pixmap_style") == 0)
-    {
-      if (!value || grub_strcmp (value, "inherit") == 0)
-        {
-          grub_free (self->selected_item_box_pattern);
-          char *tmp = self->item_box_pattern;
-          self->selected_item_box_pattern = tmp ? grub_strdup (tmp) : 0;
-          self->selected_item_box_pattern_inherit = 1;
-        }
-      else
-        {
-          self->need_to_recreate_boxes = 1;
-          grub_free (self->selected_item_box_pattern);
-          self->selected_item_box_pattern = value ? grub_strdup (value) : 0;
-          self->selected_item_box_pattern_inherit = 0;
-        }
-    }
-  else if (grub_strcmp (name, "scrollbar_frame") == 0)
-    {
-      self->need_to_recreate_scrollbar = 1;
-      grub_free (self->scrollbar_frame_pattern);
-      self->scrollbar_frame_pattern = value ? grub_strdup (value) : 0;
-    }
-  else if (grub_strcmp (name, "scrollbar_thumb") == 0)
-    {
-      self->need_to_recreate_scrollbar = 1;
-      grub_free (self->scrollbar_thumb_pattern);
-      self->scrollbar_thumb_pattern = value ? grub_strdup (value) : 0;
-    }
-  else if (grub_strcmp (name, "scrollbar_thumb_overlay") == 0)
-    {
-      self->scrollbar_thumb_overlay = grub_strcmp (value, "true") == 0;
-    }
-  else if (grub_strcmp (name, "scrollbar_width") == 0)
-    {
-      self->scrollbar_width = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "scrollbar_slice") == 0)
-    {
-      if (grub_strcmp (value, "west") == 0)
-        self->scrollbar_slice = SCROLLBAR_SLICE_WEST;
-      else if (grub_strcmp (value, "center") == 0)
-        self->scrollbar_slice = SCROLLBAR_SLICE_CENTER;
-      else if (grub_strcmp (value, "east") == 0)
-        self->scrollbar_slice = SCROLLBAR_SLICE_EAST;
-    }
-  else if (grub_strcmp (name, "scrollbar_left_pad") == 0)
-    {
-      self->scrollbar_left_pad = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "scrollbar_right_pad") == 0)
-    {
-      self->scrollbar_right_pad = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "scrollbar_top_pad") == 0)
-    {
-      self->scrollbar_top_pad = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "scrollbar_bottom_pad") == 0)
-    {
-      self->scrollbar_bottom_pad = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "scrollbar") == 0)
-    {
-      self->draw_scrollbar = grub_strcmp (value, "false") != 0;
-    }
-  else if (grub_strcmp (name, "theme_dir") == 0)
-    {
-      self->need_to_recreate_boxes = 1;
-      grub_free (self->theme_dir);
-      self->theme_dir = value ? grub_strdup (value) : 0;
-    }
-  else if (grub_strcmp (name, "id") == 0)
-    {
-      grub_free (self->id);
-      if (value)
-        self->id = grub_strdup (value);
-      else
-        self->id = 0;
-    }
-  return grub_errno;
-}
-
-/* Set necessary information that the gfxmenu view provides.  */
-static void
-list_set_view_info (void *vself,
-                    grub_gfxmenu_view_t view)
-{
-  list_impl_t self = vself;
-  grub_gfxmenu_icon_manager_set_theme_path (self->icon_manager,
-					    view->theme_path);
-  self->view = view;
-}
-
-/* Refresh list variables */
-static void
-list_refresh_info (void *vself,
-                   grub_gfxmenu_view_t view)
-{
-  list_impl_t self = vself;
-  if (view->nested)
-    self->first_shown_index = 0;
-}
-
-static struct grub_gui_component_ops list_comp_ops =
-  {
-    .destroy = list_destroy,
-    .get_id = list_get_id,
-    .is_instance = list_is_instance,
-    .paint = list_paint,
-    .set_parent = list_set_parent,
-    .get_parent = list_get_parent,
-    .set_bounds = list_set_bounds,
-    .get_bounds = list_get_bounds,
-    .get_minimal_size = list_get_minimal_size,
-    .set_property = list_set_property
-  };
-
-static struct grub_gui_list_ops list_ops =
-{
-  .set_view_info = list_set_view_info,
-  .refresh_list = list_refresh_info
-};
-
-grub_gui_component_t
-grub_gui_list_new (void)
-{
-  list_impl_t self;
-  grub_font_t default_font;
-  grub_video_rgba_color_t default_fg_color;
-
-  self = grub_zalloc (sizeof (*self));
-  if (! self)
-    return 0;
-
-  self->list.ops = &list_ops;
-  self->list.component.ops = &list_comp_ops;
-
-  self->visible = 1;
-
-  default_font = grub_font_get ("Unknown Regular 16");
-  default_fg_color = grub_video_rgba_color_rgb (0, 0, 0);
-
-  self->icon_width = 32;
-  self->icon_height = 32;
-  self->item_height = 42;
-  self->item_padding = 14;
-  self->item_icon_space = 4;
-  self->item_spacing = 16;
-  self->item_font = default_font;
-  self->selected_item_font_inherit = 1; /* Default to using the item_font.  */
-  self->selected_item_font = default_font;
-  self->item_color = default_fg_color;
-  self->selected_item_color_inherit = 1;  /* Default to using the item_color.  */
-  self->selected_item_color = default_fg_color;
-
-  self->draw_scrollbar = 1;
-  self->need_to_recreate_scrollbar = 1;
-  self->scrollbar_frame = 0;
-  self->scrollbar_thumb = 0;
-  self->scrollbar_frame_pattern = 0;
-  self->scrollbar_thumb_pattern = 0;
-  self->scrollbar_thumb_overlay = 0;
-  self->scrollbar_width = 16;
-  self->scrollbar_slice = SCROLLBAR_SLICE_EAST;
-  self->scrollbar_left_pad = 2;
-  self->scrollbar_right_pad = 0;
-  self->scrollbar_top_pad = 0;
-  self->scrollbar_bottom_pad = 0;
-
-  self->first_shown_index = 0;
-
-  self->need_to_recreate_boxes = 0;
-  self->theme_dir = 0;
-  self->menu_box_pattern = 0;
-  self->item_box_pattern = 0;
-  self->selected_item_box_pattern_inherit = 1;/*Default to using the item_box.*/
-  self->selected_item_box_pattern = 0;
-  self->menu_box = grub_gfxmenu_create_box (0, 0);
-  self->item_box = grub_gfxmenu_create_box (0, 0);
-  self->selected_item_box = grub_gfxmenu_create_box (0, 0);
-
-  self->icon_manager = grub_gfxmenu_icon_manager_new ();
-  if (! self->icon_manager)
-    {
-      self->list.component.ops->destroy (self);
-      return 0;
-    }
-  grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
-                                           self->icon_width,
-                                           self->icon_height);
-  return (grub_gui_component_t) self;
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
@ -163,12 +163,6 @@ theme_set_string (grub_gfxmenu_view_t view,
    grub_video_parse_color (value, &view->message_color);
  else if (! grub_strcmp ("message-bg-color", name))
    grub_video_parse_color (value, &view->message_bg_color);
-  else if (! grub_strcmp("menu-tip-left", name))
-    grub_env_set("VTOY_TIP_LEFT", value);
-  else if (! grub_strcmp("menu-tip-top", name))
-    grub_env_set("VTOY_TIP_TOP", value);
-  else if (! grub_strcmp("menu-tip-color", name))
-    grub_env_set("VTOY_TIP_COLOR", value);
  else if (! grub_strcmp ("desktop-image", name))
    {
      struct grub_video_bitmap *raw_bitmap;
@ -295,8 +289,6 @@ theme_set_string (grub_gfxmenu_view_t view,
      if (! view->title_text)
        return grub_errno;
    }
-  else if (! grub_strcmp ("ventoy_left_top_color", name))
-      return grub_errno;
  else
    {
      return grub_error (GRUB_ERR_BAD_ARGUMENT,
@ -458,8 +450,7 @@ read_expression (struct parsebuf *p)
      /* Read as a single word -- for numeric values or words without
         whitespace.  */
      start = p->pos;
-      while (has_more (p) && ! is_whitespace (peek_char (p))
-             && peek_char (p) != '}')
+      while (has_more (p) && ! is_whitespace (peek_char (p)))
        read_char (p);
      end = p->pos;
    }
@ -734,11 +725,6 @@ read_property (struct parsebuf *p)
                  "%s:%d:%d property value invalid; "
                  "enclose literal values in quotes (\")",
                  p->filename, p->line_num, p->col_num);
-      
-      grub_printf("File: %s\nLine:%d Column:%d\n"
-                  "property value invalid; enclose literal values in quotes (\")\n\n",
-                  p->filename, p->line_num, p->col_num);
-
      goto done;
    }

@ -747,14 +733,11 @@ done:
  return grub_errno;
 }

-extern int g_menu_update_mode;
-
 /* Set properties on the view based on settings from the specified
   theme file.  */
 grub_err_t
 grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
 {
-  int flag = 0;
  grub_file_t file;
  struct parsebuf p;

@ -769,7 +752,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
    }

  p.len = grub_file_size (file);
-  p.buf = grub_malloc (p.len + 8192);
+  p.buf = grub_malloc (p.len + 4096);
  p.pos = 0;
  p.line_num = 1;
  p.col_num = 1;
@ -798,8 +781,6 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
  }
 }

-
-
  if (view->canvas)
    view->canvas->component.ops->destroy (view->canvas);

@ -810,7 +791,6 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
    ->ops->set_bounds ((grub_gui_component_t) view->canvas,
                       &view->screen);

-parse:    
  while (has_more (&p))
    {
      /* Skip comments (lines beginning with #).  */
@ -839,40 +819,6 @@ parse:
        goto fail;
    }

-
-if (flag == 0)
-{
-    const char *tip = grub_env_get("VTOY_MENU_TIP_ENABLE");
-    if (tip && tip[0] == '1')
-    {
-        char tmpmsg[512];
-
-        grub_memset(tmpmsg, 'w', 500);
-        tmpmsg[500] = 0;
-        
-        g_menu_update_mode = 1;
-        p.len += grub_snprintf(p.buf + p.len, 4096, 
-            "\n+ vbox{\n    left = %s\n    top = %s\n"
-            "+ label { id=\"VTOY_MENU_TIP_1\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
-            "+ label { id=\"VTOY_MENU_TIP_2\" text = \"%s\" color = \"%s\" align = \"%s\"}\n"
-            "}\n",
-            grub_env_get("VTOY_TIP_LEFT"),
-            grub_env_get("VTOY_TIP_TOP"),
-            tmpmsg,
-            grub_env_get("VTOY_TIP_COLOR"),
-            grub_env_get("VTOY_TIP_ALIGN"),
-            tmpmsg,
-            grub_env_get("VTOY_TIP_COLOR"),
-            grub_env_get("VTOY_TIP_ALIGN")
-        );
-
-        flag = 1;
-        goto parse;
-    }
-}
-
-
-
  /* Set the new theme path.  */
  grub_free (view->theme_path);
  view->theme_path = grub_strdup (theme_path);
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
@ -37,7 +37,6 @@
 #include <grub/gui_string_util.h>
 #include <grub/icon_manager.h>
 #include <grub/i18n.h>
-#include <grub/charset.h>

 static void
 init_terminal (grub_gfxmenu_view_t view);
@ -143,8 +142,6 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
  grub_free (view->title_text);
  grub_free (view->progress_message_text);
  grub_free (view->theme_path);
-  if (view->menu_title_offset)
-    grub_free (view->menu_title_offset);
  if (view->canvas)
    view->canvas->component.ops->destroy (view->canvas);
  grub_free (view);
@ -389,37 +386,21 @@ redraw_menu_visit (grub_gui_component_t component,
    }
 }

-extern int g_menu_update_mode;
-
-static void grub_gfxmenu_update_all(grub_gfxmenu_view_t view)
-{
-    grub_video_set_area_status(GRUB_VIDEO_AREA_DISABLED);
-    grub_gfxmenu_view_redraw(view, &view->screen);
-}
-
 void
 grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view)
 {
  update_menu_components (view);

-  if (g_menu_update_mode)
-    grub_gfxmenu_update_all(view);
-  else
-    grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
-                                  redraw_menu_visit, view);
-  
+  grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
+                                redraw_menu_visit, view);
  grub_video_swap_buffers ();
  if (view->double_repaint)
    {
-      if (g_menu_update_mode)
-        grub_gfxmenu_update_all(view);
-      else
-        grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
-                                      redraw_menu_visit, view);
+      grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
+				    redraw_menu_visit, view);
    }
 }

-
 void 
 grub_gfxmenu_set_chosen_entry (int entry, void *data)
 {
@ -427,34 +408,6 @@ grub_gfxmenu_set_chosen_entry (int entry, void *data)

  view->selected = entry;
  grub_gfxmenu_redraw_menu (view);
-
-  
-}
-
-void
-grub_gfxmenu_scroll_chosen_entry (void *data, int diren)
-{
-  grub_gfxmenu_view_t view = data;
-  const char *item_title;
-  int off;
-  int max;
-
-  if (!view->menu->size)
-    return;
-
-  item_title = grub_menu_get_entry (view->menu, view->selected)->title;
-  off = view->menu_title_offset[view->selected] + diren;
-  max = grub_utf8_get_num_code (item_title, grub_strlen(item_title));
-
-  if (diren == 1000000)
-    off = (max >= 20) ? (max - 20) : 0;
-  else if (off < 0)
-    off = 0;
-  else if (off > max)
-    off = max;
-
-  view->menu_title_offset[view->selected] = off;
-  grub_gfxmenu_redraw_menu (view);
 }

 static void
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
@ -471,7 +471,7 @@ grub_err_t
 grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 		grub_off_t offset, grub_size_t size, void *buf)
 {
-    if (disk->read_hook == (grub_disk_read_hook_t)(void *)grub_disk_blocklist_read)
+    if (disk->read_hook == (grub_disk_read_hook_t)grub_disk_blocklist_read)
    {
        return grub_disk_blocklist_read((ventoy_img_chunk_list *)disk->read_hook_data, sector, size, disk->log_sector_size);
    }
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/efi/mm.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/efi/mm.c
@ -49,12 +49,6 @@ static grub_efi_uintn_t finish_desc_size;
 static grub_efi_uint32_t finish_desc_version;
 int grub_efi_is_finished = 0;

-/* 160MB  160 * 1024 * 1024 / 4096 */
-#define VTOY_CHAIN_MIN_PAGES   (160 * 256)
-static grub_efi_uint64_t g_total_pages;
-static grub_efi_uint64_t g_org_required_pages;
-static grub_efi_uint64_t g_new_required_pages;
-
 /*
 * We need to roll back EFI allocations on exit. Remember allocations that
 * we'll free on exit.
@ -620,22 +614,6 @@ grub_efi_mm_init (void)
  else if (required_pages > BYTES_TO_PAGES (MAX_HEAP_SIZE))
    required_pages = BYTES_TO_PAGES (MAX_HEAP_SIZE);

-  g_org_required_pages = required_pages;
-  if (((total_pages - required_pages) >> 2) < VTOY_CHAIN_MIN_PAGES)
-  {
-      if (total_pages > (VTOY_CHAIN_MIN_PAGES << 2))
-      {
-          g_new_required_pages = total_pages - (VTOY_CHAIN_MIN_PAGES << 2);
-          if (g_new_required_pages >= 8192)
-          {
-              required_pages = g_new_required_pages;
-          }          
-      }
-  }
-
-  g_total_pages = total_pages;
-  g_new_required_pages = required_pages;
-
  /* Sort the filtered descriptors, so that GRUB can allocate pages
     from smaller regions.  */
  sort_memory_map (filtered_memory_map, desc_size, filtered_memory_map_end);
@ -692,11 +670,3 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
  return GRUB_ERR_NONE;
 }
 #endif
-
-void grub_efi_get_reserved_page_num(grub_uint64_t *total, grub_uint64_t *org_required, grub_uint64_t *new_required)
-{
-    *total = g_total_pages;
-    *org_required = g_org_required_pages;
-    *new_required = g_new_required_pages;
-}
-
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/env.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/env.c
@ -1,250 +0,0 @@
-/* env.c - Environment variables */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/env.h>
-#include <grub/env_private.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-
-/* The initial context.  */
-static struct grub_env_context initial_context;
-
-/* The current context.  */
-struct grub_env_context *grub_current_context = &initial_context;
-
-static grub_env_read_hook_t vtoy_menu_lang_read_hook;
-
-/* Return the hash representation of the string S.  */
-static unsigned int
-grub_env_hashval (const char *s)
-{
-  unsigned int i = 0;
-
-  /* XXX: This can be done much more efficiently.  */
-  while (*s)
-    i += 5 * *(s++);
-
-  return i % HASHSZ;
-}
-
-static struct grub_env_var *
-grub_env_find (const char *name)
-{
-  struct grub_env_var *var;
-  int idx = grub_env_hashval (name);
-
-  /* Look for the variable in the current context.  */
-  for (var = grub_current_context->vars[idx]; var; var = var->next)
-    if (grub_strcmp (var->name, name) == 0)
-      return var;
-
-  return 0;
-}
-
-static void
-grub_env_insert (struct grub_env_context *context,
-		 struct grub_env_var *var)
-{
-  int idx = grub_env_hashval (var->name);
-
-  /* Insert the variable into the hashtable.  */
-  var->prevp = &context->vars[idx];
-  var->next = context->vars[idx];
-  if (var->next)
-    var->next->prevp = &(var->next);
-  context->vars[idx] = var;
-}
-
-static void
-grub_env_remove (struct grub_env_var *var)
-{
-  /* Remove the entry from the variable table.  */
-  *var->prevp = var->next;
-  if (var->next)
-    var->next->prevp = var->prevp;
-}
-
-grub_err_t
-grub_env_set (const char *name, const char *val)
-{
-  struct grub_env_var *var;
-
-  /* If the variable does already exist, just update the variable.  */
-  var = grub_env_find (name);
-  if (var)
-    {
-      char *old = var->value;
-
-      if (var->write_hook)
-	var->value = var->write_hook (var, val);
-      else
-	var->value = grub_strdup (val);
-
-      if (! var->value)
-	{
-	  var->value = old;
-	  return grub_errno;
-	}
-
-      grub_free (old);
-      return GRUB_ERR_NONE;
-    }
-
-  /* The variable does not exist, so create a new one.  */
-  var = grub_zalloc (sizeof (*var));
-  if (! var)
-    return grub_errno;
-
-  var->name = grub_strdup (name);
-  if (! var->name)
-    goto fail;
-
-  var->value = grub_strdup (val);
-  if (! var->value)
-    goto fail;
-
-  grub_env_insert (grub_current_context, var);
-
-  return GRUB_ERR_NONE;
-
- fail:
-  grub_free (var->name);
-  grub_free (var->value);
-  grub_free (var);
-
-  return grub_errno;
-}
-
-const char *
-grub_env_get (const char *name)
-{
-  struct grub_env_var *var;
-
-  if (name && vtoy_menu_lang_read_hook && grub_strncmp(name, "VTLANG_", 7) == 0)
-    return vtoy_menu_lang_read_hook(NULL, name);
-
-  var = grub_env_find (name);
-  if (! var)
-    return 0;
-
-  if (var->read_hook)
-    return var->read_hook (var, var->value);
-
-  return var->value;
-}
-
-void
-grub_env_unset (const char *name)
-{
-  struct grub_env_var *var;
-
-  var = grub_env_find (name);
-  if (! var)
-    return;
-
-  if (var->read_hook || var->write_hook)
-    {
-      grub_env_set (name, "");
-      return;
-    }
-
-  grub_env_remove (var);
-
-  grub_free (var->name);
-  grub_free (var->value);
-  grub_free (var);
-}
-
-struct grub_env_var *
-grub_env_update_get_sorted (void)
-{
-  struct grub_env_var *sorted_list = 0;
-  int i;
-
-  /* Add variables associated with this context into a sorted list.  */
-  for (i = 0; i < HASHSZ; i++)
-    {
-      struct grub_env_var *var;
-
-      for (var = grub_current_context->vars[i]; var; var = var->next)
-	{
-	  struct grub_env_var *p, **q;
-
-	  for (q = &sorted_list, p = *q; p; q = &((*q)->sorted_next), p = *q)
-	    {
-	      if (grub_strcmp (p->name, var->name) > 0)
-		break;
-	    }
-
-	  var->sorted_next = *q;
-	  *q = var;
-	}
-    }
-
-  return sorted_list;
-}
-
-grub_err_t
-grub_register_variable_hook (const char *name,
-			     grub_env_read_hook_t read_hook,
-			     grub_env_write_hook_t write_hook)
-{
-  struct grub_env_var *var = grub_env_find (name);
-
-  if (! var)
-    {
-      if (grub_env_set (name, "") != GRUB_ERR_NONE)
-	return grub_errno;
-
-      var = grub_env_find (name);
-      /* XXX Insert an assertion?  */
-    }
-
-  var->read_hook = read_hook;
-  var->write_hook = write_hook;
-
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_register_vtoy_menu_lang_hook(grub_env_read_hook_t read_hook)
-{
-  vtoy_menu_lang_read_hook = read_hook;
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_env_export (const char *name)
-{
-  struct grub_env_var *var;
-
-  var = grub_env_find (name);
-  if (! var)
-    {
-      grub_err_t err;
-      
-      err = grub_env_set (name, "");
-      if (err)
-	return err;
-      var = grub_env_find (name);
-    }    
-  var->global = 1;
-
-  return GRUB_ERR_NONE;
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/file.c
@ -106,136 +106,19 @@ int ventoy_check_file_exist(const char * fmt, ...)
    }
 }

-typedef struct grub_vlnk
-{
-    int srclen;
-    char src[512];
-    char dst[512];
-    struct grub_vlnk *next;
-}grub_vlnk;
-
-static grub_vlnk g_vtoy_vlnk;
-static grub_vlnk *g_vlnk_list;
-
-int grub_file_is_vlnk_suffix(const char *name, int len)
-{
-    grub_uint32_t suffix;
-
-    if (len > 9)
-    {
-        suffix = *(grub_uint32_t *)(name + len - 4);
-        if (grub_strncmp(name + len - 9, ".vlnk.", 6) == 0)
-        {
-            /* .iso .wim .img .vhd .efi .dat */
-            if (suffix == 0x6F73692E || suffix == 0x6D69772E || 
-                suffix == 0x676D692E || suffix == 0x6468762E ||
-                suffix == 0x6966652E || suffix == 0x7461642E)
-            {
-                return 1;
-            }
-        }
-        else if (len > 10 && grub_strncmp(name + len - 10, ".vlnk.", 6) == 0)
-        {
-            /* vhdx vtoy */
-            if (suffix == 0x78646876 || suffix == 0x796F7476)
-            {
-                return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int grub_file_vtoy_vlnk(const char *src, const char *dst)
-{
-    if (src)
-    {
-        g_vtoy_vlnk.srclen = (int)grub_strlen(src);
-        grub_strncpy(g_vtoy_vlnk.src, src, sizeof(g_vtoy_vlnk.src) - 1);
-        grub_strncpy(g_vtoy_vlnk.dst, dst, sizeof(g_vtoy_vlnk.dst) - 1);        
-    }
-    else
-    {
-        g_vtoy_vlnk.srclen = 0;
-        g_vtoy_vlnk.src[0] = 0;
-        g_vtoy_vlnk.dst[0] = 0;
-    }
-    return 0;
-}
-
-int grub_file_add_vlnk(const char *src, const char *dst)
-{
-    grub_vlnk *node = NULL;
-    
-    if (src && dst)
-    {
-        node = grub_zalloc(sizeof(grub_vlnk));    
-        if (node)
-        {
-            node->srclen = (int)grub_strlen(src);
-            grub_strncpy(node->src, src, sizeof(node->src) - 1);
-            grub_strncpy(node->dst, dst, sizeof(node->dst) - 1);
-
-            node->next = g_vlnk_list;
-            g_vlnk_list = node;
-            return 0;            
-        }
-    }
-
-    return 1;
-}
-
-const char *grub_file_get_vlnk(const char *name, int *vlnk)
-{
-    int len;
-    grub_vlnk *node = g_vlnk_list;
-
-    len = grub_strlen(name);
-
-    if (!grub_file_is_vlnk_suffix(name, len))
-    {
-        return name;
-    }
-
-    if (len == g_vtoy_vlnk.srclen && grub_strcmp(name, g_vtoy_vlnk.src) == 0)
-    {
-        if (vlnk)
-            *vlnk = 1;
-        return g_vtoy_vlnk.dst; 
-    }
-    
-    while (node)
-    {
-        if (node->srclen == len && grub_strcmp(name, node->src) == 0)
-        {
-            if (vlnk)
-                *vlnk = 1;
-            return node->dst;
-        }
-        node = node->next;
-    }
-
-    return name;
-}
-
 grub_file_t
 grub_file_open (const char *name, enum grub_file_type type)
 {
-  int vlnk = 0;
  grub_device_t device = 0;
  grub_file_t file = 0, last_file = 0;
  char *device_name;
  const char *file_name;
  grub_file_filter_id_t filter;

-  /* <DESC> : mem:xxx:size:xxx format in chainloader grub_strlen(GRUB_MEMFILE_MEM) */
-  if (grub_strncmp(name, GRUB_MEMFILE_MEM, 4) == 0) {
+  /* <DESC> : mem:xxx:size:xxx format in chainloader */
+  if (grub_strncmp(name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
      return grub_memfile_open(name);
-  }
-
-  if ((g_vlnk_list || g_vtoy_vlnk.srclen) && (type & GRUB_FILE_TYPE_NO_VLNK) == 0)
-    name = grub_file_get_vlnk(name, &vlnk);
+  }  

  device_name = grub_file_get_device_name (name);
  if (grub_errno)
@ -258,7 +141,6 @@ grub_file_open (const char *name, enum grub_file_type type)
    goto fail;

  file->device = device;
-  file->vlnk = vlnk;

  /* In case of relative pathnames and non-Unix systems (like Windows)
   * name of host files may not start with `/'. Blocklists for host files
@ -342,12 +224,10 @@ grub_file_read (grub_file_t file, void *buf, grub_size_t len)
  if (len == 0)
    return 0;

-  if (file->name) {
-    if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
+  if (grub_strncmp(file->name, GRUB_MEMFILE_MEM, grub_strlen(GRUB_MEMFILE_MEM)) == 0) {
      grub_memcpy(buf, (grub_uint8_t *)(file->data) + file->offset, len);
      file->offset += len;
      return len;
-    }
  }
  
  read_hook = file->read_hook;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/fs.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/kern/fs.c
@ -42,44 +42,6 @@ probe_dummy_iter (const char *filename __attribute__ ((unused)),
  return 1;
 }

-grub_fs_t grub_fs_list_probe(grub_device_t device, const char **list)
-{
-    int i;
-    grub_fs_t p;
-
-    if (!device->disk)
-        return 0;
-
-    for (p = grub_fs_list; p; p = p->next) 
-    {
-        for (i = 0; list[i]; i++) 
-        {
-            if (grub_strcmp(p->name, list[i]) == 0)
-                break;
-        }
-
-        if (list[i] == NULL)
-            continue;
-        
-        grub_dprintf("fs", "Detecting %s...\n", p->name);
-
-	    (p->fs_dir) (device, "/", probe_dummy_iter, NULL);
-	    if (grub_errno == GRUB_ERR_NONE)
-	        return p;
-
-        grub_error_push ();
-        grub_dprintf ("fs", "%s detection failed.\n", p->name);
-        grub_error_pop ();
-
-        if (grub_errno != GRUB_ERR_BAD_FS && grub_errno != GRUB_ERR_OUT_OF_RANGE) {
-            return 0;
-        }
-	    grub_errno = GRUB_ERR_NONE;
-	}
-
-    return 0;
-}
-
 grub_fs_t
 grub_fs_probe (grub_device_t device)
 {
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/lib/syslinux_parse.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/lib/syslinux_parse.c
@ -362,8 +362,7 @@ static grub_err_t
 cmd_append (const char *line, struct syslinux_menu *menu)
 {
  if (!menu->entries)
-    return GRUB_ERR_NONE;
-    //return grub_error (GRUB_ERR_BAD_ARGUMENT, "kernel without label");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "kernel without label");

  menu->entries->append = grub_strdup (line);
  if (!menu->entries->append)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/arm64/linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/arm64/linux.c
@ -279,13 +279,6 @@ static int ventoy_boot_opt_filter(char *opt)
        opt[1] = 't';
        return 0;
    }
-    
-    if (grub_strncmp(opt, "dm=", 3) == 0)
-    {
-        opt[0] = 'D';
-        opt[1] = 'M';
-        return 0;
-    }

    if (ventoy_debug)
    {
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/chainloader.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/efi/chainloader.c
@ -229,7 +229,10 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  if (! file)
    goto fail;

-  dev = file->device;
+  /* Get the root device's device path.  */
+  dev = grub_device_open (0);
+  if (! dev)
+    goto fail;

  if (dev->disk)
    dev_handle = grub_efidisk_get_device_handle (dev->disk);
@ -254,13 +257,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  if (dev_handle)
    dp = grub_efi_get_device_path (dev_handle);

-  if (dp != NULL)
+  if (! dp)
    {
-      file_path = make_file_path (dp, filename);
-      if (! file_path)
-        goto fail;
+      grub_error (GRUB_ERR_BAD_DEVICE, "not a valid root device");
+      goto fail;
    }

+  file_path = make_file_path (dp, filename);
+  if (! file_path)
+    goto fail;
+
  //grub_printf ("file path: ");
  //grub_efi_print_device_path (file_path);

@ -384,12 +390,16 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    }

  grub_file_close (file);
+  grub_device_close (dev);

  grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
  return 0;

 fail:

+  if (dev)
+    grub_device_close (dev);
+
  if (file)
    grub_file_close (file);

--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/i386/linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/i386/linux.c
@ -88,8 +88,6 @@ static int ventoy_linux_argc = 0;
 static char **ventoy_linux_args = NULL;
 static int ventoy_extra_initrd_num = 0;
 static char *ventoy_extra_initrd_list[256];
-static grub_command_func_t ventoy_linux16_func = NULL;
-static grub_command_func_t ventoy_initrd16_func = NULL;
 static grub_err_t
 grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]);

@ -508,13 +506,6 @@ static int ventoy_boot_opt_filter(char *opt)
        return 0;
    }

-    if (grub_strncmp(opt, "dm=", 3) == 0)
-    {
-        opt[0] = 'D';
-        opt[1] = 'M';
-        return 0;
-    }
-
    if (ventoy_debug)
    {
        if (grub_strcmp(opt, "quiet") == 0)
@ -669,6 +660,54 @@ static int ventoy_bootopt_hook(int argc, char *argv[])
    return 0;
 }

+static grub_err_t
+grub_cmd_set_boot_opt (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+    int i;
+    const char *vtdebug;
+
+    for (i = 0; i < argc; i++)
+    {
+        ventoy_linux_args[ventoy_linux_argc + (LINUX_MAX_ARGC / 2) ] = grub_strdup(argv[i]);
+        ventoy_linux_argc++;
+    }
+
+    vtdebug = grub_env_get("vtdebug_flag");
+    if (vtdebug && vtdebug[0])
+    {
+        ventoy_debug = 1;
+    }
+
+    if (ventoy_debug) grub_printf("ventoy set boot opt %d\n", ventoy_linux_argc);
+
+    return 0;
+}
+
+static grub_err_t
+grub_cmd_unset_boot_opt (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+    int i;
+    
+    (void)argc;
+    (void)argv;
+
+    for (i = 0; i < LINUX_MAX_ARGC; i++)
+    {
+        if (ventoy_linux_args[i])
+        {
+            grub_free(ventoy_linux_args[i]);
+        }
+    }
+
+    ventoy_debug = 0;
+    ventoy_linux_argc = 0;
+    ventoy_initrd_called = 0;
+    grub_memset(ventoy_linux_args, 0, sizeof(char *) * LINUX_MAX_ARGC);
+    return 0;
+}
+
 static grub_err_t
 grub_cmd_extra_initrd_append (grub_command_t cmd __attribute__ ((unused)),
 		int argc, char *argv[])
@ -1530,92 +1569,6 @@ ventoy_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
    return grub_cmd_initrd(cmd, ventoy_extra_initrd_num, ventoy_extra_initrd_list);
 }

-static grub_err_t
-grub_cmd_set_boot_opt (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-    int i;
-    const char *vtdebug;
-    grub_command_t regcmd;
-        
-    for (i = 0; i < argc; i++)
-    {
-        ventoy_linux_args[ventoy_linux_argc + (LINUX_MAX_ARGC / 2) ] = grub_strdup(argv[i]);
-        ventoy_linux_argc++;
-    }
-
-    vtdebug = grub_env_get("vtdebug_flag");
-    if (vtdebug && vtdebug[0])
-    {
-        ventoy_debug = 1;
-    }
-
-    if (ventoy_debug) grub_printf("ventoy set boot opt %d\n", ventoy_linux_argc);
-
-    ventoy_linux16_func = ventoy_initrd16_func = NULL;
-    regcmd = grub_command_find("linux16");
-    if (regcmd)
-    {
-        ventoy_linux16_func = regcmd->func;
-        regcmd->func = grub_cmd_linux;
-    }
-    
-    regcmd = grub_command_find("initrd16");
-    if (regcmd)
-    {
-        ventoy_initrd16_func = regcmd->func;
-        regcmd->func = ventoy_cmd_initrd;
-    }
-
-    return 0;
-}
-
-static grub_err_t
-grub_cmd_unset_boot_opt (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-    int i;
-    grub_command_t regcmd;
-    
-    (void)argc;
-    (void)argv;
-
-    for (i = 0; i < LINUX_MAX_ARGC; i++)
-    {
-        if (ventoy_linux_args[i])
-        {
-            grub_free(ventoy_linux_args[i]);
-        }
-    }
-
-    ventoy_debug = 0;
-    ventoy_linux_argc = 0;
-    ventoy_initrd_called = 0;
-    grub_memset(ventoy_linux_args, 0, sizeof(char *) * LINUX_MAX_ARGC);
-
-    if (ventoy_linux16_func)
-    {
-        regcmd = grub_command_find("linux16");
-        if (regcmd)
-        {
-            regcmd->func = ventoy_linux16_func;
-        }
-        ventoy_linux16_func = NULL;
-    }
-
-    if (ventoy_initrd16_func)
-    {
-        regcmd = grub_command_find("initrd16");
-        if (regcmd)
-        {
-            regcmd->func = ventoy_initrd16_func;
-        }
-        ventoy_initrd16_func = NULL;
-    }
-    
-    return 0;
-}
-

 static grub_command_t cmd_linux, cmd_initrd, cmd_linuxefi, cmd_initrdefi;
 static grub_command_t cmd_set_bootopt, cmd_unset_bootopt, cmd_extra_initrd_append, cmd_extra_initrd_reset;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/linux.c
@ -128,22 +128,11 @@ insert_dir (const char *name, struct dir **root,
 	  n->name = grub_strndup (cb, ce - cb);
 	  if (ptr)
 	    {
-	      /*
-	       * Create the substring with the trailing NUL byte
-	       * to be included in the cpio header.
-	       */
-	      char *tmp_name = grub_strndup (name, ce - name);
-	      if (!tmp_name) {
-		grub_free (n->name);
-		grub_free (n);
-		return grub_errno;
-	      }
 	      grub_dprintf ("linux", "Creating directory %s, %s\n", name, ce);
-	      ptr = make_header (ptr, tmp_name, ce - name + 1,
+	      ptr = make_header (ptr, name, ce - name,
 				 040777, 0);
-	      grub_free (tmp_name);
 	    }
-	  size += ALIGN_UP ((ce - (char *) name + 1)
+	  size += ALIGN_UP ((ce - (char *) name)
 			    + sizeof (struct newc_head), 4);
 	  *head = n;
 	  cur = n;
@ -194,7 +183,7 @@ grub_initrd_init (int argc, char *argv[],
 		}
 	      initrd_ctx->size
 		+= ALIGN_UP (sizeof (struct newc_head)
-			    + grub_strlen (initrd_ctx->components[i].newc_name) + 1,
+			    + grub_strlen (initrd_ctx->components[i].newc_name),
 			     4);
 	      initrd_ctx->size += insert_dir (initrd_ctx->components[i].newc_name,
 					      &root, 0);
@ -205,7 +194,7 @@ grub_initrd_init (int argc, char *argv[],
      else if (newc)
 	{
 	  initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head)
-					+ sizeof ("TRAILER!!!"), 4);
+					+ sizeof ("TRAILER!!!") - 1, 4);
 	  free_dir (root);
 	  root = 0;
 	  newc = 0;
@ -228,7 +217,7 @@ grub_initrd_init (int argc, char *argv[],
    {
      initrd_ctx->size = ALIGN_UP (initrd_ctx->size, 4);
      initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head)
-				    + sizeof ("TRAILER!!!"), 4);
+				    + sizeof ("TRAILER!!!") - 1, 4);
      free_dir (root);
      root = 0;
    }
@ -280,14 +269,14 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
 	  ptr += insert_dir (initrd_ctx->components[i].newc_name,
 			     &root, ptr);
 	  ptr = make_header (ptr, initrd_ctx->components[i].newc_name,
-			     grub_strlen (initrd_ctx->components[i].newc_name) + 1,
+			     grub_strlen (initrd_ctx->components[i].newc_name),
 			     0100777,
 			     initrd_ctx->components[i].size);
 	  newc = 1;
 	}
      else if (newc)
 	{
-	  ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"),
+	  ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1,
 			     0, 0);
 	  free_dir (root);
 	  root = 0;
@ -319,7 +308,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
    {
      grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
      ptr += ALIGN_UP_OVERHEAD (cursize, 4);
-      ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"), 0, 0);
+      ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1, 0, 0);
    }
  free_dir (root);
  root = 0;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/mips64/linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/loader/mips64/linux.c
@ -228,13 +228,6 @@ static int ventoy_boot_opt_filter(char *opt)
        return 0;
    }

-    if (grub_strncmp(opt, "dm=", 3) == 0)
-    {
-        opt[0] = 'D';
-        opt[1] = 'M';
-        return 0;
-    }
-
    if (ventoy_debug)
    {
        if (grub_strcmp(opt, "quiet") == 0)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/charset.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/charset.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
@ -33,9 +33,6 @@
 #include <grub/gfxterm.h>
 #include <grub/dl.h>
 #include <grub/env.h>
-#include <grub/extcmd.h>
-#include <grub/ventoy.h>
-#include "ventoy/ventoy_def.h"

 int g_ventoy_menu_refresh = 0;
 int g_ventoy_memdisk_mode = 0;
@ -45,48 +42,9 @@ int g_ventoy_wimboot_mode = 0;
 int g_ventoy_iso_uefi_drv = 0;
 int g_ventoy_last_entry = -1;
 int g_ventoy_suppress_esc = 0;
-int g_ventoy_suppress_esc_default = 1;
 int g_ventoy_menu_esc = 0;
 int g_ventoy_fn_mutex = 0;
-int g_ventoy_secondary_menu_on = 0;
 int g_ventoy_terminal_output = 0;
-char g_ventoy_hotkey_tip[256];
-
-static int g_vt_key_num = 0;
-static int g_vt_key_code[128];
-
-static int ventoy_menu_pop_key(void)
-{
-    if (g_vt_key_num > 0 && g_vt_key_num < (int)(sizeof(g_vt_key_code) / sizeof(g_vt_key_code[0])))
-    {
-        g_vt_key_num--;
-        return g_vt_key_code[g_vt_key_num];
-    }
-    return -1;
-}
-
-int ventoy_menu_push_key(int code)
-{
-    if (g_vt_key_num >= 0 && g_vt_key_num < (int)(sizeof(g_vt_key_code) / sizeof(g_vt_key_code[0])))
-    {
-        g_vt_key_code[g_vt_key_num++] = code;
-        return 0;
-    }
-    return -1;
-}
-
-#define VTOY_COMM_HOTKEY(cmdkey) \
-if (0 == g_ventoy_fn_mutex && 0 == g_ventoy_secondary_menu_on) { \
-    cmdstr = grub_env_get(cmdkey); \
-    if (cmdstr) \
-    { \
-        menu_fini (); \
-        g_ventoy_fn_mutex = 1; \
-        grub_script_execute_sourcecode(cmdstr); \
-        g_ventoy_fn_mutex = 0; \
-        goto refresh; \
-    } \
-}

 /* Time to delay after displaying an error message about a default/fallback
   entry failing to boot.  */
@ -423,78 +381,14 @@ grub_menu_execute_with_fallback (grub_menu_t menu,

 static struct grub_menu_viewer *viewers;

-int g_menu_update_mode = 0;
-int g_ventoy_tip_label_enable = 0;
-const char * g_ventoy_tip_msg1 = NULL;
-const char * g_ventoy_tip_msg2 = NULL;
-char g_ventoy_theme_path[256] = {0};
-static const char *g_ventoy_cur_img_path = NULL;
-static void menu_set_chosen_tip(grub_menu_t menu, int entry)
-{
-    int i;
-    img_info *img;
-    menu_tip *tip;
-    grub_menu_entry_t e = grub_menu_get_entry (menu, entry);
-
-    if (g_ventoy_theme_path[0])
-    {
-        grub_env_set("theme", g_ventoy_theme_path);        
-    }
-
-    g_ventoy_tip_msg1 = g_ventoy_tip_msg2 = NULL;
-    if (e && e->id && grub_strncmp(e->id, "VID_", 4) == 0) 
-    {
-        g_ventoy_theme_path[0] = 0;
-        img = (img_info *)(void *)grub_strtoul(e->id + 4, NULL, 16);
-        if (img)
-        {
-            g_ventoy_tip_msg1 = img->tip1;
-            g_ventoy_tip_msg2 = img->tip2;
-            g_ventoy_cur_img_path = img->path;
-        }
-    }
-    else if (e && e->id && grub_strncmp(e->id, "DIR_", 4) == 0)
-    {
-        g_ventoy_theme_path[0] = 0;
-        for (i = 0; i < e->argc; i++)
-        {
-            if (e->args[i] && grub_strncmp(e->args[i], "_VTIP_", 6) == 0)
-            {
-                break;
-            }
-        }
-
-        if (i < e->argc)
-        {
-            tip = (menu_tip *)(void *)grub_strtoul(e->args[i] + 6, NULL, 16);
-            if (tip)
-            {
-                g_ventoy_tip_msg1 = tip->tip1;
-                g_ventoy_tip_msg2 = tip->tip2;
-            }
-        }
-    }
-}
-
 static void
-menu_set_chosen_entry (grub_menu_t menu, int entry)
+menu_set_chosen_entry (int entry)
 {
  struct grub_menu_viewer *cur;
-  
-  menu_set_chosen_tip(menu, entry);
  for (cur = viewers; cur; cur = cur->next)
    cur->set_chosen_entry (entry, cur->data);
 }

-static void
-menu_scroll_chosen_entry (int diren)
-{
-  struct grub_menu_viewer *cur;
-  for (cur = viewers; cur; cur = cur->next)
-    if (cur->scroll_chosen_entry)
-      cur->scroll_chosen_entry (cur->data, diren);
-}
-
 static void
 menu_print_timeout (int timeout)
 {
@ -704,8 +598,10 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
  default_entry = get_entry_number (menu, "default");

  if (g_ventoy_suppress_esc)
-      default_entry = g_ventoy_suppress_esc_default;
-
+      default_entry = 1;
+  else if (g_ventoy_last_entry >= 0 && g_ventoy_last_entry < menu->size) {
+      default_entry = g_ventoy_last_entry;
+  } 
  /* If DEFAULT_ENTRY is not within the menu entries, fall back to
     the first entry.  */
  else if (default_entry < 0 || default_entry >= menu->size)
@ -784,7 +680,6 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
  current_entry = default_entry;

 refresh:
-  menu_set_chosen_tip(menu, current_entry);
  menu_init (current_entry, menu, nested);

  /* Initialize the time.  */
@ -820,11 +715,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	  return default_entry;
 	}

-    if (g_vt_key_num > 0) {
-        c = ventoy_menu_pop_key();
-    } else {
-        c = grub_getkey_noblock ();
-    }
+      c = grub_getkey_noblock ();

      /* Negative values are returned on error. */
      if ((c != GRUB_TERM_NO_KEY) && (c > 0))
@ -841,13 +732,13 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	    case GRUB_TERM_KEY_HOME:
 	    case GRUB_TERM_CTRL | 'a':
 	      current_entry = 0;
-	      menu_set_chosen_entry (menu, current_entry);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case GRUB_TERM_KEY_END:
 	    case GRUB_TERM_CTRL | 'e':
 	      current_entry = menu->size - 1;
-	      menu_set_chosen_entry (menu, current_entry);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case GRUB_TERM_KEY_UP:
@ -855,7 +746,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	    case '^':
 	      if (current_entry > 0)
 		current_entry--;
-	      menu_set_chosen_entry (menu, current_entry);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case GRUB_TERM_CTRL | 'n':
@ -863,7 +754,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	    case 'v':
 	      if (current_entry < menu->size - 1)
 		current_entry++;
-	      menu_set_chosen_entry (menu, current_entry);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case GRUB_TERM_CTRL | 'g':
@ -872,7 +763,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 		current_entry = 0;
 	      else
 		current_entry -= GRUB_MENU_PAGE_SIZE;
-	      menu_set_chosen_entry (menu, current_entry);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case GRUB_TERM_CTRL | 'c':
@ -881,20 +772,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 		current_entry += GRUB_MENU_PAGE_SIZE;
 	      else
 		current_entry = menu->size - 1;
-	      menu_set_chosen_entry (menu, current_entry);
-	      break;
-
-	    case GRUB_TERM_KEY_RIGHT:
-	      menu_scroll_chosen_entry (1);
-	      break;
-	    case GRUB_TERM_KEY_LEFT:
-	      menu_scroll_chosen_entry (-1);
-	      break;
-	    case GRUB_TERM_CTRL | GRUB_TERM_KEY_RIGHT:
-	      menu_scroll_chosen_entry (1000000);
-	      break;
-	    case GRUB_TERM_CTRL | GRUB_TERM_KEY_LEFT:
-	      menu_scroll_chosen_entry (-1000000);
+	      menu_set_chosen_entry (current_entry);
 	      break;

 	    case '\n':
@ -929,135 +807,116 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)

        case GRUB_TERM_KEY_F2:
        case '2':
-            VTOY_COMM_HOTKEY("VTOY_F2_CMD");
+            if (0 == g_ventoy_fn_mutex) {
+                cmdstr = grub_env_get("VTOY_F2_CMD");
+                if (cmdstr)
+                {
+                    menu_fini ();
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
+            }
            break;
        case GRUB_TERM_KEY_F3:
        case '3':
-            VTOY_COMM_HOTKEY("VTOY_F3_CMD");
+            if (0 == g_ventoy_fn_mutex) {
+                cmdstr = grub_env_get("VTOY_F3_CMD");
+                if (cmdstr)
+                {
+                    menu_fini ();
+                    grub_script_execute_sourcecode(cmdstr);
+                    goto refresh;
+                }
+            }
            break;
        case GRUB_TERM_KEY_F4:
        case '4':
-            VTOY_COMM_HOTKEY("VTOY_F4_CMD");
+            if (0 == g_ventoy_fn_mutex) {
+                cmdstr = grub_env_get("VTOY_F4_CMD");
+                if (cmdstr)
+                {
+                    menu_fini ();
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
+            }
            break;
        case GRUB_TERM_KEY_F5:
        case '5':
-            VTOY_COMM_HOTKEY("VTOY_F5_CMD");
+            if (0 == g_ventoy_fn_mutex) {
+                cmdstr = grub_env_get("VTOY_F5_CMD");
+                if (cmdstr)
+                {
+                    menu_fini ();
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
+            }
            break;
        case GRUB_TERM_KEY_F6:
        case '6':
-            VTOY_COMM_HOTKEY("VTOY_F6_CMD");
+            if (0 == g_ventoy_fn_mutex) {
+                cmdstr = grub_env_get("VTOY_F6_CMD");
+                if (cmdstr)
+                {
+                    menu_fini ();
+                    g_ventoy_fn_mutex = 1;
+                    grub_script_execute_sourcecode(cmdstr);
+                    g_ventoy_fn_mutex = 0;
+                    goto refresh;
+                }
+            }
            break;
        case GRUB_TERM_KEY_F7:
            menu_fini ();
            if (g_ventoy_terminal_output == 0)
            {
-                grub_script_execute_sourcecode("vt_push_menu_lang en_US\nterminal_output console");
+                grub_script_execute_sourcecode("terminal_output console");
                g_ventoy_terminal_output = 1;
            }
            else
            {
-                grub_script_execute_sourcecode("terminal_output gfxterm\nvt_pop_menu_lang");
+                grub_script_execute_sourcecode("terminal_output gfxterm");
                g_ventoy_terminal_output = 0;
            }
            goto refresh;
        case GRUB_TERM_KEY_F1:
        case '1':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                cmdstr = grub_env_get("VTOY_HELP_CMD");
-                if (cmdstr)
-                {
-                    grub_script_execute_sourcecode(cmdstr);
-                    while (grub_getkey() != GRUB_TERM_ESC)
-                        ;
-                    menu_fini ();
-                    goto refresh;
-                }                
-            }
-            break;
-        case (GRUB_TERM_CTRL | 'd'):
-        case 'd':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                menu_fini ();
-                g_ventoy_memdisk_mode = 1 - g_ventoy_memdisk_mode;
-                g_ventoy_menu_refresh = 1;                
-                goto refresh;
-            }
-            break;
+            menu_fini ();
+            g_ventoy_memdisk_mode = 1 - g_ventoy_memdisk_mode;
+            g_ventoy_menu_refresh = 1;
+            goto refresh;
+            
        case (GRUB_TERM_CTRL | 'i'):
-        case 'i':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                menu_fini ();
-                g_ventoy_iso_raw = 1 - g_ventoy_iso_raw;
-                g_ventoy_menu_refresh = 1;
-                goto refresh;                
-            }
-            break;
+            menu_fini ();
+            g_ventoy_iso_raw = 1 - g_ventoy_iso_raw;
+            g_ventoy_menu_refresh = 1;
+            goto refresh;
+            
        case (GRUB_TERM_CTRL | 'r'):
-        case 'r':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                menu_fini ();
-                g_ventoy_grub2_mode = 1 - g_ventoy_grub2_mode;
-                g_ventoy_menu_refresh = 1;                
-                goto refresh;
-            }
-            break;            
+            menu_fini ();
+            g_ventoy_grub2_mode = 1 - g_ventoy_grub2_mode;
+            g_ventoy_menu_refresh = 1;
+            goto refresh;
+            
        case (GRUB_TERM_CTRL | 'w'):
-        case 'w':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                menu_fini ();
-                g_ventoy_wimboot_mode = 1 - g_ventoy_wimboot_mode;
-                g_ventoy_menu_refresh = 1;
-                goto refresh;
-            }
-            break;
+            menu_fini ();
+            g_ventoy_wimboot_mode = 1 - g_ventoy_wimboot_mode;
+            g_ventoy_menu_refresh = 1;
+            goto refresh;
+            
        case (GRUB_TERM_CTRL | 'u'):
-        case 'u':
-            if (0 == g_ventoy_secondary_menu_on)
-            {
-                menu_fini ();
-                g_ventoy_iso_uefi_drv = 1 - g_ventoy_iso_uefi_drv;
-                g_ventoy_menu_refresh = 1;
-                goto refresh;
-            }
-            break;
-        case (GRUB_TERM_CTRL | 'l'):
-        case (GRUB_TERM_CTRL | 'L'):
-        case (GRUB_TERM_SHIFT | 'l'):
-        case (GRUB_TERM_SHIFT | 'L'):
-        case 'l':
-        case 'L':
-        {
-            VTOY_COMM_HOTKEY("VTOY_LANG_CMD");
-            break;
-        }
-        case (GRUB_TERM_CTRL | 'm'):
-        case 'm':
-        {
-            if (0 == g_ventoy_secondary_menu_on)
-            {                
-                if (g_ventoy_cur_img_path)
-                {
-                    grub_env_set("VTOY_CHKSUM_FILE_PATH", g_ventoy_cur_img_path);
-                    cmdstr = grub_env_get("VTOY_CHKSUM_CMD");
-                    if (cmdstr)
-                    {
-                        menu_fini();
-                        grub_script_execute_sourcecode(cmdstr);
-                        goto refresh;
-                    }
-                }
-                else
-                {
-                    grub_env_set("VTOY_CHKSUM_FILE_PATH", "X");
-                }
-            }
-            break;
-        }
+            menu_fini ();
+            g_ventoy_iso_uefi_drv = 1 - g_ventoy_iso_uefi_drv;
+            g_ventoy_menu_refresh = 1;
+            goto refresh;
+
 	    default:
 	      {
 		int entry;
@ -1133,7 +992,6 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
    
  while (1)
    {
-      int ndown;
      int boot_entry;
      grub_menu_entry_t e;
      int auto_boot;
@ -1152,11 +1010,6 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
              break;          
      }

-      if (autobooted == 0 && g_ventoy_menu_esc && auto_boot) {
-          g_ventoy_last_entry = boot_entry;
-          break;
-      }
-
      e = grub_menu_get_entry (menu, boot_entry);
      if (! e)
 	continue; /* Menu is empty.  */
@ -1176,16 +1029,6 @@ show_menu (grub_menu_t menu, int nested, int autobooted)

      if (2 == e->argc && e->args && e->args[1] && grub_strncmp(e->args[1], "VTOY_RUN_RET", 12) == 0)
        break; 
-      else if (2 == e->argc && e->args && e->args[1] && grub_strncmp(e->args[1], "VTOY_RUN_SET", 12) == 0) {        
-        ndown = (int)grub_strtol(e->args[1] + 12, NULL, 10);
-        while (ndown > 0)
-        {
-            ventoy_menu_push_key(GRUB_TERM_KEY_DOWN);
-            ndown--;
-        }
-        ventoy_menu_push_key('\n');
-        break;         
-      }
    }

  return GRUB_ERR_NONE;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu_text.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu_text.c
@ -31,8 +31,6 @@
 static grub_uint8_t grub_color_menu_normal;
 static grub_uint8_t grub_color_menu_highlight;

-extern char g_ventoy_hotkey_tip[256];
-
 struct menu_viewer_data
 {
  int first, offset;
@ -44,7 +42,6 @@ struct menu_viewer_data
    TIMEOUT_TERSE_NO_MARGIN
  } timeout_msg;
  grub_menu_t menu;
-  int *menu_title_offset;
  struct grub_term_output *term;
 };

@ -206,7 +203,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),
 	  ret += grub_print_message_indented_real(szLine, STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
      
 	  ret += grub_print_message_indented_real("\n", STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
-	  ret += grub_print_message_indented_real(g_ventoy_hotkey_tip,
+	  ret += grub_print_message_indented_real(grub_env_get("VTOY_HOTKEY_TIP"),
 	     3, 6, term, dry_run);
 	}	
    }
@ -527,37 +524,6 @@ menu_text_set_chosen_entry (int entry, void *dataptr)
  grub_term_refresh (data->term);
 }

-static void
-menu_text_scroll_chosen_entry (void *dataptr, int diren)
-{
-  struct menu_viewer_data *data = dataptr;
-  const char *orig_title, *scrolled_title;
-  int off;
-  int selected;
-  grub_menu_entry_t entry;
-
-  if (!data->menu->size)
-    return;
-
-  selected = data->first + data->offset;
-  entry = grub_menu_get_entry (data->menu, selected);
-  orig_title = entry->title;
-  off = data->menu_title_offset[selected] + diren;
-  if (off < 0
-      || off > grub_utf8_get_num_code (orig_title, grub_strlen(orig_title)))
-    return;
-
-  scrolled_title =
-    grub_utf8_offset_code (orig_title, grub_strlen (orig_title), off);
-  if (scrolled_title)
-    entry->title = scrolled_title;
-  print_entry (data->geo.first_entry_y + data->offset, 1, entry, data);
-
-  entry->title = orig_title;
-  data->menu_title_offset[selected] = off;
-  grub_term_refresh (data->term);
-}
-
 static void
 menu_text_fini (void *dataptr)
 {
@ -565,8 +531,6 @@ menu_text_fini (void *dataptr)

  grub_term_setcursor (data->term, 1);
  grub_term_cls (data->term);
-  if (data->menu_title_offset)
-    grub_free (data->menu_title_offset);
  grub_free (data);
 }

@ -621,14 +585,9 @@ grub_menu_try_text (struct grub_term_output *term,
      return grub_errno;
    }

-  if (menu->size)
-    data->menu_title_offset = grub_zalloc (sizeof (*data->menu_title_offset) * menu->size);
-
  data->term = term;
  instance->data = data;
  instance->set_chosen_entry = menu_text_set_chosen_entry;
-  if (data->menu_title_offset)
-    instance->scroll_chosen_entry = menu_text_scroll_chosen_entry;
  instance->print_timeout = menu_text_print_timeout;
  instance->clear_timeout = menu_text_clear_timeout;
  instance->fini = menu_text_fini;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/partmap/gpt.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/partmap/gpt.c
@ -1,232 +0,0 @@
-/* gpt.c - Read GUID Partition Tables (GPT).  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2005,2006,2007,2008  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/disk.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/partition.h>
-#include <grub/dl.h>
-#include <grub/msdos_partition.h>
-#include <grub/gpt_partition.h>
-#include <grub/i18n.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static grub_uint8_t grub_gpt_magic[8] =
-  {
-    0x45, 0x46, 0x49, 0x20, 0x50, 0x41, 0x52, 0x54
-  };
-
-static const grub_gpt_part_guid_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY;
-
-#ifdef GRUB_UTIL
-static const grub_gpt_part_guid_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
-#endif
-
-/* 512 << 7 = 65536 byte sectors.  */
-#define MAX_SECTOR_LOG 7
-
-static struct grub_partition_map grub_gpt_partition_map;
-
-
-
-grub_err_t
-grub_gpt_partition_map_iterate (grub_disk_t disk,
-				grub_partition_iterate_hook_t hook,
-				void *hook_data)
-{
-  struct grub_partition part;
-  struct grub_gpt_header gpt;
-  struct grub_gpt_partentry entry;
-  struct grub_msdos_partition_mbr mbr;
-  grub_uint64_t entries;
-  unsigned int i;
-  int last_offset = 0;
-  int sector_log = 0;
-
-  /* Read the protective MBR.  */
-  if (grub_disk_read (disk, 0, 0, sizeof (mbr), &mbr))
-    return grub_errno;
-
-  /* Check if it is valid.  */
-  if (mbr.signature != grub_cpu_to_le16_compile_time (GRUB_PC_PARTITION_SIGNATURE))
-    return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
-
-  /* Make sure the MBR is a protective MBR and not a normal MBR.  */
-  for (i = 0; i < 4; i++)
-    if (mbr.entries[i].type == GRUB_PC_PARTITION_TYPE_GPT_DISK)
-      break;
-  if (i == 4)
-    return grub_error (GRUB_ERR_BAD_PART_TABLE, "no GPT partition map found");
-
-  /* Read the GPT header.  */
-  for (sector_log = 0; sector_log < MAX_SECTOR_LOG; sector_log++)
-    {
-      if (grub_disk_read (disk, 1 << sector_log, 0, sizeof (gpt), &gpt))
-	return grub_errno;
-
-      if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic)) == 0)
-	break;
-    }
-  if (sector_log == MAX_SECTOR_LOG)
-    return grub_error (GRUB_ERR_BAD_PART_TABLE, "no valid GPT header");
-
-  grub_dprintf ("gpt", "Read a valid GPT header\n");
-
-  entries = grub_le_to_cpu64 (gpt.partitions) << sector_log;
-  for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
-    {
-      if (grub_disk_read (disk, entries, last_offset,
-			  sizeof (entry), &entry))
-	return grub_errno;
-
-      if (grub_memcmp (&grub_gpt_partition_type_empty, &entry.type,
-		       sizeof (grub_gpt_partition_type_empty)))
-	{
-	  /* Calculate the first block and the size of the partition.  */
-	  part.start = grub_le_to_cpu64 (entry.start) << sector_log;
-	  part.len = (grub_le_to_cpu64 (entry.end)
-		      - grub_le_to_cpu64 (entry.start) + 1)  << sector_log;
-	  part.offset = entries;
-	  part.number = i;
-	  part.index = last_offset;
-	  part.partmap = &grub_gpt_partition_map;
-	  part.parent = disk->partition;
-      part.gpt_attrib = entry.attrib;
-
-	  grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
-			(unsigned long long) part.start,
-			(unsigned long long) part.len);
-
-	  if (hook (disk, &part, hook_data))
-	    return grub_errno;
-	}
-
-      last_offset += grub_le_to_cpu32 (gpt.partentry_size);
-      if (last_offset == GRUB_DISK_SECTOR_SIZE)
-	{
-	  last_offset = 0;
-	  entries++;
-	}
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-#ifdef GRUB_UTIL
-/* Context for gpt_partition_map_embed.  */
-struct gpt_partition_map_embed_ctx
-{
-  grub_disk_addr_t start, len;
-};
-
-/* Helper for gpt_partition_map_embed.  */
-static int
-find_usable_region (grub_disk_t disk __attribute__ ((unused)),
-		    const grub_partition_t p, void *data)
-{
-  struct gpt_partition_map_embed_ctx *ctx = data;
-  struct grub_gpt_partentry gptdata;
-  grub_partition_t p2;
-
-  p2 = disk->partition;
-  disk->partition = p->parent;
-  if (grub_disk_read (disk, p->offset, p->index,
-		      sizeof (gptdata), &gptdata))
-    {
-      disk->partition = p2;
-      return 0;
-    }
-  disk->partition = p2;
-
-  /* If there's an embed region, it is in a dedicated partition.  */
-  if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
-    {
-      ctx->start = p->start;
-      ctx->len = p->len;
-      return 1;
-    }
-
-  return 0;
-}
-
-static grub_err_t
-gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
-			 unsigned int max_nsectors,
-			 grub_embed_type_t embed_type,
-			 grub_disk_addr_t **sectors)
-{
-  struct gpt_partition_map_embed_ctx ctx = {
-    .start = 0,
-    .len = 0
-  };
-  unsigned i;
-  grub_err_t err;
-
-  if (embed_type != GRUB_EMBED_PCBIOS)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "GPT currently supports only PC-BIOS embedding");
-
-  err = grub_gpt_partition_map_iterate (disk, find_usable_region, &ctx);
-  if (err)
-    return err;
-
-  if (ctx.len == 0)
-    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-		       N_("this GPT partition label contains no BIOS Boot Partition;"
-			  " embedding won't be possible"));
-
-  if (ctx.len < *nsectors)
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-		       N_("your BIOS Boot Partition is too small;"
-			  " embedding won't be possible"));
-
-  *nsectors = ctx.len;
-  if (*nsectors > max_nsectors)
-    *nsectors = max_nsectors;
-  *sectors = grub_malloc (*nsectors * sizeof (**sectors));
-  if (!*sectors)
-    return grub_errno;
-  for (i = 0; i < *nsectors; i++)
-    (*sectors)[i] = ctx.start + i;
-
-  return GRUB_ERR_NONE;
-}
-#endif
-
-
-/* Partition map type.  */
-static struct grub_partition_map grub_gpt_partition_map =
-  {
-    .name = "gpt",
-    .iterate = grub_gpt_partition_map_iterate,
-#ifdef GRUB_UTIL
-    .embed = gpt_partition_map_embed
-#endif
-  };
-
-GRUB_MOD_INIT(part_gpt)
-{
-  grub_partition_map_register (&grub_gpt_partition_map);
-}
-
-GRUB_MOD_FINI(part_gpt)
-{
-  grub_partition_map_unregister (&grub_gpt_partition_map);
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/script/function.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/script/function.c
@ -1,113 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2009,2010  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/misc.h>
-#include <grub/script_sh.h>
-#include <grub/parser.h>
-#include <grub/mm.h>
-#include <grub/charset.h>
-
-grub_script_function_t grub_script_function_list;
-
-grub_script_function_t
-grub_script_function_create (struct grub_script_arg *functionname_arg,
-			     struct grub_script *cmd)
-{
-  grub_script_function_t func;
-  grub_script_function_t *p;
-
-  func = (grub_script_function_t) grub_malloc (sizeof (*func));
-  if (! func)
-    return 0;
-
-  func->name = grub_strdup (functionname_arg->str);
-  if (! func->name)
-    {
-      grub_free (func);
-      return 0;
-    }
-
-  func->func = cmd;
-
-  /* Keep the list sorted for simplicity.  */
-  p = &grub_script_function_list;
-  while (*p)
-    {
-      if (grub_strcmp ((*p)->name, func->name) >= 0)
-	break;
-
-      p = &((*p)->next);
-    }
-
-  /* If the function already exists, overwrite the old function.  */
-  if (*p && grub_strcmp ((*p)->name, func->name) == 0)
-    {
-      grub_script_function_t q;
-
-      q = *p;
-      grub_script_free (q->func);
-      q->func = cmd;
-      grub_free (func);
-      func = q;
-    }
-  else
-    {
-      func->next = *p;
-      *p = func;
-    }
-
-  return func;
-}
-
-void
-grub_script_function_remove (const char *name)
-{
-  grub_script_function_t *p, q;
-
-  for (p = &grub_script_function_list, q = *p; q; p = &(q->next), q = q->next)
-    if (grub_strcmp (name, q->name) == 0)
-      {
-        *p = q->next;
-	grub_free (q->name);
-	grub_script_free (q->func);
-        grub_free (q);
-        break;
-      }
-}
-
-grub_script_function_t
-grub_script_function_find (char *functionname)
-{
-  grub_script_function_t func;
-
-  for (func = grub_script_function_list; func; func = func->next)
-    if (grub_strcmp (functionname, func->name) == 0)
-      break;
-
-  if (! func)
-    {
-      char tmp[64];
-      grub_strncpy (tmp, functionname, 63);
-      tmp[63] = 0;
-      /* Avoid truncating inside UTF-8 character.  */
-      tmp[grub_getend (tmp, tmp + grub_strlen (tmp))] = 0;
-      grub_error (GRUB_ERR_UNKNOWN_COMMAND, N_("can't find command `%s'"), tmp);
-    }
-
-  return func;
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
@ -1,260 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2022  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/term.h>
-#include <grub/misc.h>
-#include <grub/types.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-#include <grub/err.h>
-#include <grub/env.h>
-#include <grub/efi/efi.h>
-#include <grub/efi/api.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-#define GRUB_EFI_SIMPLE_POINTER_GUID  \
-  { 0x31878c87, 0x0b75, 0x11d5, \
-    { 0x9a, 0x4f, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
-  }
-
-typedef struct
-{
-  grub_efi_int32_t x;
-  grub_efi_int32_t y;
-  grub_efi_int32_t z;
-  grub_efi_boolean_t left;
-  grub_efi_boolean_t right;
-} grub_efi_mouse_state;
-
-grub_efi_mouse_state no_move = {0, 0, 0, 0, 0};
-
-typedef struct
-{
-  grub_efi_uint64_t x;
-  grub_efi_uint64_t y;
-  grub_efi_uint64_t z;
-  grub_efi_boolean_t left;
-  grub_efi_boolean_t right;
-} grub_efi_mouse_mode;
-
-struct grub_efi_simple_pointer_protocol
-{
-  grub_efi_status_t (*reset) (struct grub_efi_simple_pointer_protocol *this,
-                              grub_efi_boolean_t extended_verification);
-  grub_efi_status_t (*get_state) (struct grub_efi_simple_pointer_protocol *this,
-                                  grub_efi_mouse_state *state);
-  grub_efi_event_t *wait_for_input;
-  grub_efi_mouse_mode *mode;
-};
-typedef struct grub_efi_simple_pointer_protocol grub_efi_simple_pointer_protocol_t;
-
-typedef struct
-{
-  grub_efi_uintn_t count;
-  grub_efi_simple_pointer_protocol_t **mouse;
-} grub_efi_mouse_prot_t;
-
-static grub_int32_t
-mouse_div (grub_int32_t a, grub_uint64_t b)
-{
-  grub_int32_t s = 1, q, ret;
-  grub_uint64_t n = a;
-  if (!b)
-    return 0;
-  if (a < 0)
-  {
-    s = -1;
-    n = -a;
-  }
-  q = grub_divmod64 (n, b, NULL);
-  ret = s * (q > 0 ? q : -q);
-  return ret;
-}
-
-static grub_efi_mouse_prot_t *
-grub_efi_mouse_prot_init (void)
-{
-  grub_efi_status_t status;
-  grub_efi_guid_t mouse_guid = GRUB_EFI_SIMPLE_POINTER_GUID;
-  grub_efi_mouse_prot_t *mouse_input = NULL;
-  grub_efi_boot_services_t *b = grub_efi_system_table->boot_services;
-  grub_efi_handle_t *buf;
-  grub_efi_uintn_t count;
-  grub_efi_uintn_t i;
-
-  status = efi_call_5 (b->locate_handle_buffer, GRUB_EFI_BY_PROTOCOL,
-                       &mouse_guid, NULL, &count, &buf);
-  if (status != GRUB_EFI_SUCCESS)
-  {
-#ifdef MOUSE_DEBUG
-    grub_printf ("ERROR: SimplePointerProtocol not found.\n");
-#endif
-    return NULL;
-  }
-
-  mouse_input = grub_malloc (sizeof (grub_efi_mouse_prot_t));
-  if (!mouse_input)
-    goto end;
-  mouse_input->mouse = grub_malloc (count
-            * sizeof (grub_efi_simple_pointer_protocol_t *));
-  if (!mouse_input->mouse)
-  {
-    grub_free (mouse_input);
-    mouse_input = NULL;
-    goto end;
-  }
-  mouse_input->count = count;
-  for (i = 0; i < count; i++)
-  {
-    efi_call_3 (b->handle_protocol,
-                buf[i], &mouse_guid, (void **)&mouse_input->mouse[i]);
-#ifdef MOUSE_DEBUG
-    grub_printf ("%d %p ", (int)i, mouse_input->mouse[i]);
-#endif
-    efi_call_2 (mouse_input->mouse[i]->reset, mouse_input->mouse[i], 1);
-#ifdef MOUSE_DEBUG
-    grub_printf
-      ("[%"PRIuGRUB_UINT64_T"] [%"PRIuGRUB_UINT64_T"] [%"PRIuGRUB_UINT64_T"]\n",
-       mouse_input->mouse[i]->mode->x,
-       mouse_input->mouse[i]->mode->y, mouse_input->mouse[i]->mode->z);
-#endif
-  }
-  
-end:  
-  efi_call_1(b->free_pool, buf);
-
-  return mouse_input;
-}
-
-static grub_err_t
-grub_efi_mouse_input_init (struct grub_term_input *term)
-{
-  grub_efi_mouse_prot_t *mouse_input = NULL;
-  if (term->data)
-    return 0;
-  mouse_input = grub_efi_mouse_prot_init ();
-  if (!mouse_input)
-    return GRUB_ERR_BAD_OS;
-
-  term->data = (void *)mouse_input;
-
-  return 0;
-}
-
-static int
-grub_mouse_getkey (struct grub_term_input *term)
-{
-  grub_efi_mouse_state cur;
-  grub_efi_mouse_prot_t *mouse = term->data;
-  //int x;
-  int y;
-  int delta = 0;
-  const char *env;
-  grub_efi_uintn_t i;
-  if (!mouse)
-    return GRUB_TERM_NO_KEY;
-
-  env = grub_env_get("mouse_delta");
-  if (env)
-    delta = (int)grub_strtol(env, NULL, 10);
-  
-  for (i = 0; i < mouse->count; i++)
-  {
-    efi_call_2 (mouse->mouse[i]->get_state, mouse->mouse[i], &cur);
-    if (grub_memcmp (&cur, &no_move, sizeof (grub_efi_mouse_state)) != 0)
-    {
-      y = mouse_div (cur.y, mouse->mouse[i]->mode->y);
-      if (cur.left)
-        return 0x0d;
-      if (cur.right)
-        return GRUB_TERM_ESC;
-      if (y > delta)
-        return GRUB_TERM_KEY_DOWN;
-      if (y < -delta)
-        return GRUB_TERM_KEY_UP;
-    }
-  }
-  return GRUB_TERM_NO_KEY;
-}
-
-#ifdef MOUSE_DEBUG
-static grub_err_t
-grub_cmd_mouse_test (grub_command_t cmd __attribute__ ((unused)),
-                    int argc __attribute__ ((unused)),
-                    char **args __attribute__ ((unused)))
-
-{
-  grub_efi_mouse_state cur;
-  int x = 0, y = 0, z = 0;
-  grub_efi_uintn_t i;
-  grub_efi_mouse_prot_t *mouse = NULL;
-
-  mouse = grub_efi_mouse_prot_init ();
-  if (!mouse)
-    return grub_error (GRUB_ERR_BAD_OS, "mouse not found.\n");
-  grub_printf ("Press [1] to exit.\n");
-  while (1)
-  {
-    if (grub_getkey_noblock () == '1')
-      break;
-    for (i = 0; i < mouse->count; i++)
-    {
-      efi_call_2 (mouse->mouse[i]->get_state, mouse->mouse[i], &cur);
-      if (grub_memcmp (&cur, &no_move, sizeof (grub_efi_mouse_state)) != 0)
-      {
-        x = mouse_div (cur.x, mouse->mouse[i]->mode->x);
-        y = mouse_div (cur.y, mouse->mouse[i]->mode->y);
-        z = mouse_div (cur.z, mouse->mouse[i]->mode->z);
-        grub_printf ("[ID=%d] X=%d Y=%d Z=%d L=%d R=%d\n",
-                     (int)i, x, y, z, cur.left, cur.right);
-      }
-    }
-    grub_refresh ();
-  }
-  grub_free (mouse->mouse);
-  grub_free (mouse);
-  return GRUB_ERR_NONE;
-}
-static grub_command_t cmd;
-#endif
-
-static struct grub_term_input grub_mouse_term_input =
-{
-  .name = "mouse",
-  .getkey = grub_mouse_getkey,
-  .init = grub_efi_mouse_input_init,
-};
-
-GRUB_MOD_INIT(mouse)
-{
-  grub_term_register_input ("mouse", &grub_mouse_term_input);
-#ifdef MOUSE_DEBUG
-  cmd = grub_register_command ("mouse_test", grub_cmd_mouse_test, 0,
-                               N_("UEFI mouse test."));
-#endif
-}
-
-GRUB_MOD_FINI(mouse)
-{
-  grub_term_unregister_input (&grub_mouse_term_input);
-#ifdef MOUSE_DEBUG
-  grub_unregister_command (cmd);
-#endif
-}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/lzx.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/lzx.c
@ -462,8 +462,6 @@ static int lzx_uncompressed ( struct lzx *lzx ) {
 	if ( len % 2 )
 		lzx->input.offset++;

-    lzx->output.offset += len;
-
 	return 0;
 }

@ -616,7 +614,7 @@ ssize_t lzx_decompress ( const void *data, size_t len, void *buf ) {
 	/* Sanity check */
 	if ( len % 2 ) {
 		DBG ( "LZX cannot handle odd-length input data\n" );
-		//return -1;
+		return -1;
 	}

 	/* Initialise global state, if required */
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
@ -35,11 +35,6 @@
 #include <grub/misc.h>
 #include <grub/kernel.h>
 #include <grub/time.h>
-#include <grub/memory.h>
-#ifdef GRUB_MACHINE_EFI
-#include <grub/efi/efi.h>
-#include <grub/efi/memory.h>
-#endif
 #include <grub/ventoy.h>
 #include "ventoy_def.h"

@ -58,149 +53,6 @@ void ventoy_debug(const char *fmt, ...)
    va_end (args);
 }

-void ventoy_str_tolower(char *str)
-{
-    while (*str)
-    {
-        *str = grub_tolower(*str);
-        str++;
-    }
-}
-
-void ventoy_str_toupper(char *str)
-{
-    while (*str)
-    {
-        *str = grub_toupper(*str);
-        str++;
-    }
-}
-
-char *ventoy_str_last(char *str, char ch)
-{
-    char *pos = NULL;
-    char *last = NULL;
-
-    if (!str)
-    {
-        return NULL;
-    }
-
-    for (pos = str; *pos; pos++)
-    {
-        if (*pos == ch)
-        {
-            last = pos;
-        }
-    }
-
-    return last;
-}
-
-int ventoy_str_all_digit(const char *str)
-{
-    if (NULL == str || 0 == *str)
-    {
-        return 0;
-    }
-
-    while (*str)
-    {
-        if (*str < '0' || *str > '9')
-        {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-int ventoy_str_all_alnum(const char *str)
-{
-    if (NULL == str || 0 == *str)
-    {
-        return 0;
-    }
-
-    while (*str)
-    {
-        if (!grub_isalnum(*str))
-        {
-            return 0;
-        }
-    }
-
-    return 1;
-}
-
-int ventoy_str_len_alnum(const char *str, int len)
-{
-    int i;
-    int slen;
-    
-    if (NULL == str || 0 == *str)
-    {
-        return 0;
-    }
-
-    slen = grub_strlen(str);
-    if (slen <= len)
-    {
-        return 0;
-    }
-
-    for (i = 0; i < len; i++)
-    {
-        if (!grub_isalnum(str[i]))
-        {
-            return 0;
-        }
-    }
-
-    if (str[len] == 0 || grub_isspace(str[len]))
-    {
-        return 1;
-    }
-
-    return 0;
-}
-
-char * ventoy_str_basename(char *path)
-{
-    char *pos = NULL;
-    
-    pos = grub_strrchr(path, '/');
-    if (pos)
-    {
-        pos++;
-    }
-    else
-    {
-        pos = path;
-    }
-
-    return pos;
-}
-
-int ventoy_str_chrcnt(const char *str, char c)
-{
-    int n = 0;
-    
-    if (str)
-    {
-        while (*str)
-        {
-            if (*str == c)
-            {
-                n++;                
-            }
-            str++;
-        }        
-    }
-
-    return n;
-}
-
 int ventoy_strcmp(const char *pattern, const char *str)
 {
    while (*pattern && *str)
@ -232,14 +84,6 @@ int ventoy_strncmp (const char *pattern, const char *str, grub_size_t n)
    return (int)(grub_uint8_t)*pattern - (int)(grub_uint8_t)*str;
 }

-grub_err_t ventoy_env_int_set(const char *name, int value)
-{
-    char buf[16];
-    
-    grub_snprintf(buf, sizeof(buf), "%d", value);
-    return grub_env_set(name, buf);
-}
-
 void ventoy_debug_dump_guid(const char *prefix, grub_uint8_t *guid)
 {
    int i;
@ -267,37 +111,6 @@ int ventoy_is_efi_os(void)
    return g_efi_os;
 }

-void * ventoy_alloc_chain(grub_size_t size)
-{
-    void *p = NULL;
-
-    p = grub_malloc(size);
-#ifdef GRUB_MACHINE_EFI
-    if (!p)
-    {
-        p = grub_efi_allocate_any_pages(GRUB_EFI_BYTES_TO_PAGES(size));
-    }
-#endif
-
-    return p;
-}
-
-void ventoy_memfile_env_set(const char *prefix, const void *buf, unsigned long long len)
-{
-    char name[128];
-    char val[64];
-
-    grub_snprintf(name, sizeof(name), "%s_addr", prefix);
-    grub_snprintf(val, sizeof(val), "0x%llx", (ulonglong)(ulong)buf);
-    grub_env_set(name, val);
-    
-    grub_snprintf(name, sizeof(name), "%s_size", prefix);
-    grub_snprintf(val, sizeof(val), "%llu", len);
-    grub_env_set(name, val);
-
-    return;
-}
-
 static int ventoy_arch_mode_init(void)
 {
    #ifdef GRUB_MACHINE_EFI
@ -329,170 +142,8 @@ static int ventoy_arch_mode_init(void)
    return 0;
 }

-#ifdef GRUB_MACHINE_EFI
-static void ventoy_get_uefi_version(char *str, grub_size_t len)
-{
-    grub_efi_uint8_t uefi_minor_1, uefi_minor_2;
-
-    uefi_minor_1 = (grub_efi_system_table->hdr.revision & 0xffff) / 10;
-    uefi_minor_2 = (grub_efi_system_table->hdr.revision & 0xffff) % 10;
-    grub_snprintf(str, len, "%d.%d", (grub_efi_system_table->hdr.revision >> 16), uefi_minor_1);
-    if (uefi_minor_2)
-        grub_snprintf(str, len, "%s.%d", str, uefi_minor_2);
-}
-#endif
-
-static int ventoy_calc_totalmem(grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type, void *data)
-{
-    grub_uint64_t *total_mem = (grub_uint64_t *)data;
-
-    (void)addr;
-    (void)type;
-
-    *total_mem += size;
-
-    return 0;
-}
-
-static int ventoy_hwinfo_init(void)
-{
-    char str[256];
-    grub_uint64_t total_mem = 0;
-
-    grub_machine_mmap_iterate(ventoy_calc_totalmem, &total_mem);
-
-    grub_snprintf(str, sizeof(str), "%ld", (long)(total_mem / VTOY_SIZE_1MB));
-    ventoy_env_export("grub_total_ram", str);
-
-#ifdef GRUB_MACHINE_EFI
-    ventoy_get_uefi_version(str, sizeof(str));
-    ventoy_env_export("grub_uefi_version", str);
-#else
-    ventoy_env_export("grub_uefi_version", "NA");
-#endif
-
-    return 0;
-}
-
-static global_var_cfg g_global_vars[] = 
-{
-    { "gfxmode",            "1024x768",   NULL },
-    { ventoy_left_key,      "5%",         NULL },
-    { ventoy_top_key,       "95%",        NULL },
-    { ventoy_color_key,     "#0000ff",    NULL },
-    { NULL,                 NULL,         NULL }
-};
-
-static const char * ventoy_global_var_read_hook(struct grub_env_var *var, const char *val)
-{
-    int i;
-
-    for (i = 0; g_global_vars[i].name; i++)
-    {
-        if (grub_strcmp(g_global_vars[i].name, var->name) == 0)
-        {
-            return g_global_vars[i].value;
-        }
-    }
-
-    return val;
-}
-
-static char * ventoy_global_var_write_hook(struct grub_env_var *var, const char *val)
-{
-    int i;
-
-    for (i = 0; g_global_vars[i].name; i++)
-    {
-        if (grub_strcmp(g_global_vars[i].name, var->name) == 0)
-        {
-            grub_check_free(g_global_vars[i].value);
-            g_global_vars[i].value = grub_strdup(val);
-            break;
-        }
-    }
-
-    return grub_strdup(val);
-}
-
-int ventoy_global_var_init(void)
-{
-    int i;
-
-    for (i = 0; g_global_vars[i].name; i++)
-    {
-        g_global_vars[i].value = grub_strdup(g_global_vars[i].defval);
-        ventoy_env_export(g_global_vars[i].name, g_global_vars[i].defval);        
-        grub_register_variable_hook(g_global_vars[i].name, ventoy_global_var_read_hook, ventoy_global_var_write_hook);
-    }
-
-    return 0;
-}
-
-static ctrl_var_cfg g_ctrl_vars[] = 
-{
-    { "VTOY_WIN11_BYPASS_CHECK",  1 },
-    { "VTOY_WIN11_BYPASS_NRO",    1 },
-    { "VTOY_LINUX_REMOUNT",       0 },
-    { "VTOY_SECONDARY_BOOT_MENU", 1 },
-    { NULL, 0 }
-};
-
-static const char * ventoy_ctrl_var_read_hook(struct grub_env_var *var, const char *val)
-{
-    int i;
-
-    for (i = 0; g_ctrl_vars[i].name; i++)
-    {
-        if (grub_strcmp(g_ctrl_vars[i].name, var->name) == 0)
-        {
-            return g_ctrl_vars[i].value ? "1" : "0";
-        }
-    }
-
-    return val;
-}
-
-static char * ventoy_ctrl_var_write_hook(struct grub_env_var *var, const char *val)
-{
-    int i;
-
-    for (i = 0; g_ctrl_vars[i].name; i++)
-    {
-        if (grub_strcmp(g_ctrl_vars[i].name, var->name) == 0)
-        {
-            if (val && val[0] == '1' && val[1] == 0)
-            {
-                g_ctrl_vars[i].value = 1;
-                return grub_strdup("1");
-            }
-            else
-            {
-                g_ctrl_vars[i].value = 0;
-                return grub_strdup("0");
-            }
-        }
-    }
-
-    return grub_strdup(val);
-}
-
-int ventoy_ctrl_var_init(void)
-{
-    int i;
-
-    for (i = 0; g_ctrl_vars[i].name; i++)
-    {
-        ventoy_env_export(g_ctrl_vars[i].name, g_ctrl_vars[i].value ? "1" : "0");
-        grub_register_variable_hook(g_ctrl_vars[i].name, ventoy_ctrl_var_read_hook, ventoy_ctrl_var_write_hook);
-    }
-
-    return 0;
-}
-
 GRUB_MOD_INIT(ventoy)
 {
-    ventoy_hwinfo_init();
    ventoy_env_init();
    ventoy_arch_mode_init();
    ventoy_register_all_cmd();
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_browser.c
@ -1,652 +0,0 @@
-/******************************************************************************
- * ventoy_browser.c 
- *
- * Copyright (c) 2022, longpanda <admin@ventoy.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/disk.h>
-#include <grub/device.h>
-#include <grub/term.h>
-#include <grub/partition.h>
-#include <grub/file.h>
-#include <grub/normal.h>
-#include <grub/extcmd.h>
-#include <grub/datetime.h>
-#include <grub/i18n.h>
-#include <grub/net.h>
-#include <grub/time.h>
-#include <grub/ventoy.h>
-#include "ventoy_def.h"
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-#define BROWSER_MENU_BUF    65536
-
-static const char *g_vtoy_dev = NULL;
-static grub_fs_t g_menu_fs = NULL;
-static char *g_menu_device = NULL;
-static grub_device_t g_menu_dev = NULL;
-static char g_menu_path_buf[1024];
-static int g_menu_path_len = 0;
-static browser_node *g_browser_list = NULL;
-
-static int ventoy_browser_strcmp(char *str1, char *str2)
-{
-    char *s1, *s2;
-    int c1 = 0;
-    int c2 = 0;
-
-    for (s1 = str1, s2 = str2; *s1 && *s2; s1++, s2++)
-    {
-        c1 = *s1;
-        c2 = *s2;
-
-        if (0 == g_sort_case_sensitive)
-        {
-            if (grub_islower(c1))
-            {
-                c1 = c1 - 'a' + 'A';
-            }
-            
-            if (grub_islower(c2))
-            {
-                c2 = c2 - 'a' + 'A';
-            }
-        }
-
-        if (c1 != c2)
-        {
-            break;
-        }
-    }
-
-    return (c1 - c2);
-}
-
-static int ventoy_browser_mbuf_alloc(browser_mbuf *mbuf)
-{
-    grub_memset(mbuf, 0, sizeof(browser_mbuf));
-    mbuf->buf = grub_malloc(BROWSER_MENU_BUF);
-    if (!mbuf->buf)
-    {
-        return 0;
-    }
-
-    mbuf->pos = 0;
-    mbuf->max = BROWSER_MENU_BUF;
-    return 1;
-}
-
-static inline void ventoy_browser_mbuf_free(browser_mbuf *mbuf)
-{
-    if (mbuf)
-        grub_check_free(mbuf->buf)
-}
-
-static inline int ventoy_browser_mbuf_extend(browser_mbuf *mbuf)
-{
-    if (mbuf->max - mbuf->pos <= VTOY_SIZE_1KB)
-    {
-        mbuf->max += BROWSER_MENU_BUF;
-        mbuf->buf = grub_realloc(mbuf->buf, mbuf->max);
-    }
-
-    return 0;
-}
-
-static browser_node * ventoy_browser_find_top_node(int dir)
-{
-    browser_node *node = NULL;
-    browser_node *sel = NULL;
-
-    for (node = g_browser_list; node; node = node->next)
-    {
-        if (node->dir == dir)
-        {
-            if (sel)
-            {
-                if (ventoy_browser_strcmp(sel->filename, node->filename) > 0)
-                {
-                    sel = node;
-                }
-            }
-            else
-            {
-                sel = node;
-            }
-        }
-    }
-    
-    return sel;
-}
-
-static int ventoy_browser_iterate_partition(struct grub_disk *disk, const grub_partition_t partition, void *data)
-{
-    char partname[64];
-    char title[256];
-    grub_device_t dev;
-    grub_fs_t fs;
-    char *Label = NULL;
-    browser_mbuf *mbuf = (browser_mbuf *)data;
-
-    (void)data;
-
-    if (partition->number == 1 && g_vtoy_dev && grub_strcmp(disk->name, g_vtoy_dev) == 0)
-    {
-        return 0;
-    }
-
-    grub_snprintf(partname, sizeof(partname) - 1, "%s,%d", disk->name, partition->number + 1);
-
-    dev = grub_device_open(partname);
-    if (!dev)
-    {
-        return 0;
-    }
-
-    fs = grub_fs_probe(dev);
-    if (!fs)
-    {
-        grub_device_close(dev);
-        return 0;
-    }
-
-    fs->fs_label(dev, &Label);
-
-    if (ventoy_check_file_exist("(%s)/.ventoyignore", partname))
-    {
-        return 0;
-    }
-
-    if (g_tree_view_menu_style == 0)
-    {
-        grub_snprintf(title, sizeof(title), "%-10s (%s,%s%d) [%s] %s %s", 
-            "DISK", disk->name, partition->msdostype == 0xee ? "gpt" : "msdos", 
-            partition->number + 1, (Label ? Label : ""), fs->name, 
-            grub_get_human_size(partition->len << disk->log_sector_size, GRUB_HUMAN_SIZE_SHORT));
-    }
-    else
-    {
-        grub_snprintf(title, sizeof(title), "(%s,%s%d) [%s] %s %s", 
-            disk->name, partition->msdostype == 0xee ? "gpt" : "msdos", 
-            partition->number + 1, (Label ? Label : ""), fs->name, 
-            grub_get_human_size(partition->len << disk->log_sector_size, GRUB_HUMAN_SIZE_SHORT));
-    }
-
-    if (ventoy_get_fs_type(fs->name) >= ventoy_fs_max)
-    {
-        browser_ssprintf(mbuf, "menuentry \"%s\" --class=vtoydisk {\n"
-            "   echo \"unsupported file system type!\" \n"
-            "   ventoy_pause\n"
-            "}\n",
-            title);
-    }
-    else
-    {
-        browser_ssprintf(mbuf, "menuentry \"%s\" --class=vtoydisk {\n"
-            "  vt_browser_dir %s,%d 0x%lx /\n"
-            "}\n",
-            title, disk->name, partition->number + 1, (ulong)fs);
-    }
-
-    ventoy_browser_mbuf_extend(mbuf);
-
-    return 0;
-}
-
-static int ventoy_browser_iterate_disk(const char *name, void *data)
-{
-    grub_disk_t disk;
-
-    if (name[0] != 'h')
-    {
-        return 0;
-    }
-
-    disk = grub_disk_open(name);
-    if (disk)
-    {
-        grub_partition_iterate(disk, ventoy_browser_iterate_partition, data);
-        grub_disk_close(disk);
-    }
-
-    return 0;
-}
-
-static int ventoy_browser_valid_dirname(const char *name, int len)
-{
-    if ((len == 1 && name[0] == '.') ||
-        (len == 2 && name[0] == '.' && name[1] == '.'))
-    {
-        return 0;
-    }
-
-    if (!ventoy_img_name_valid(name, len))
-    {
-        return 0;
-    }
-
-    if (g_filt_trash_dir)
-    {
-        if (0 == grub_strncmp(name, ".trash-", 7) ||
-            0 == grub_strcmp(name, ".Trashes"))
-        {
-            return 0;
-        }
-    }
-
-    if (name[0] == '$')
-    {
-        if (0 == grub_strncmp(name, "$RECYCLE.BIN", 12) ||
-            0 == grub_strncasecmp(name, "$Extend", 7))
-        {
-            return 0;
-        }
-    }
-
-    if (len == 25 && grub_strncmp(name, "System Volume Information", 25) == 0)
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-static int ventoy_browser_valid_filename(const char *filename, int len, int *type)
-{
-    if (len < 4)
-    {
-        return 0;
-    }
-
-    if (FILE_FLT(ISO) && 0 == grub_strcasecmp(filename + len - 4, ".iso"))
-    {
-        *type = img_type_iso;
-    }
-    else if (FILE_FLT(WIM) && g_wimboot_enable && (0 == grub_strcasecmp(filename + len - 4, ".wim")))
-    {
-        *type = img_type_wim;
-    }
-    else if (FILE_FLT(VHD) && g_vhdboot_enable && (0 == grub_strcasecmp(filename + len - 4, ".vhd") || 
-            (len >= 5 && 0 == grub_strcasecmp(filename + len - 5, ".vhdx"))))
-    {
-        *type = img_type_vhd;
-    }
-    #ifdef GRUB_MACHINE_EFI
-    else if (FILE_FLT(EFI) && 0 == grub_strcasecmp(filename + len - 4, ".efi"))
-    {
-        *type = img_type_efi;
-    }
-    #endif
-    else if (FILE_FLT(IMG) && 0 == grub_strcasecmp(filename + len - 4, ".img"))
-    {
-        if (len == 18 && grub_strncmp(filename, "ventoy_", 7) == 0)
-        {
-            if (grub_strncmp(filename + 7, "wimboot", 7) == 0 ||
-                grub_strncmp(filename + 7, "vhdboot", 7) == 0)
-            {
-                return 0;
-            }
-        }
-        *type = img_type_img;
-    }
-    else if (FILE_FLT(VTOY) && len >= 5 && 0 == grub_strcasecmp(filename + len - 5, ".vtoy"))
-    {
-        *type = img_type_vtoy;
-    }
-    else
-    {
-        return 0;
-    }
-
-    if (g_filt_dot_underscore_file && filename[0] == '.' && filename[1] == '_')
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
-static int ventoy_browser_check_ignore(const char *device, const char *root, const char *dir)
-{
-    grub_file_t file;
-    char fullpath[1024] = {0};
-
-    grub_snprintf(fullpath, 1023, "(%s)%s/%s/.ventoyignore", device, root, dir);
-    file = grub_file_open(fullpath, GRUB_FILE_TYPE_NONE);
-    if (!file)
-    {
-        grub_errno = 0;
-        return 0;
-    }
-    else
-    {
-        grub_file_close(file);
-        return 1;
-    }
-}
-
-static int ventoy_browser_iterate_dir(const char *filename, const struct grub_dirhook_info *info, void *data)
-{
-    int type;
-    int len;
-    browser_node *node;
-
-    (void)data;
-
-    len = grub_strlen(filename);
-    
-    if (info->dir)
-    {
-        if (!ventoy_browser_valid_dirname(filename, len))
-        {
-            return 0;
-        }
-
-        if (ventoy_browser_check_ignore(g_menu_device, g_menu_path_buf, filename))
-        {
-            return 0;
-        }
-
-        node = grub_zalloc(sizeof(browser_node));
-        if (!node)
-        {
-            return 0;
-        }
-
-        node->dir = 1;
-        grub_strncpy(node->filename, filename, sizeof(node->filename));
-
-        if (g_tree_view_menu_style == 0)
-        {
-            grub_snprintf(node->menuentry, sizeof(node->menuentry),
-                "menuentry \"%-10s [%s]\" --class=vtoydir {\n"
-                "  vt_browser_dir %s 0x%lx \"%s/%s\"\n"
-                "}\n",
-                "DIR", filename, g_menu_device, (ulong)g_menu_fs, g_menu_path_buf, filename);
-        }
-        else
-        {
-            grub_snprintf(node->menuentry, sizeof(node->menuentry),
-                "menuentry \"[%s]\" --class=vtoydir {\n"
-                "  vt_browser_dir %s 0x%lx \"%s/%s\"\n"
-                "}\n",
-                filename, g_menu_device, (ulong)g_menu_fs, g_menu_path_buf, filename);
-        }
-    }
-    else
-    {
-        grub_uint64_t fsize = info->size;
-        
-        if (!ventoy_browser_valid_filename(filename, len, &type))
-        {
-            return 0;
-        }
-
-        if (grub_file_is_vlnk_suffix(filename, len))
-        {
-            return 0;
-        }
-
-        node = grub_zalloc(sizeof(browser_node));
-        if (!node)
-        {
-            return 0;
-        }
-
-        if (fsize == 0)
-        {
-            struct grub_file file;
-
-            grub_memset(&file, 0, sizeof(file));
-            file.device = g_menu_dev;
-            grub_snprintf(node->menuentry, sizeof(node->menuentry), "%s/%s", g_menu_path_buf, filename);
-            if (g_menu_fs->fs_open(&file, node->menuentry) == GRUB_ERR_NONE)
-            {
-                fsize = file.size;
-                g_menu_fs->fs_close(&file);
-            }
-        }
-        
-        node->dir = 0;
-        grub_strncpy(node->filename, filename, sizeof(node->filename));
-
-        if (g_tree_view_menu_style == 0)
-        {
-            grub_snprintf(node->menuentry, sizeof(node->menuentry),
-                "menuentry \"%-10s %s\" --class=%s {\n"
-                "  vt_set_fake_vlnk \"(%s)%s/%s\" %s %llu\n"
-                "  %s_common_menuentry\n"
-                "  vt_reset_fake_vlnk\n"
-                "}\n",
-                grub_get_human_size(fsize, GRUB_HUMAN_SIZE_SHORT), filename, g_menu_class[type],
-                g_menu_device, g_menu_path_buf, filename, g_menu_prefix[type], (ulonglong)fsize,
-                g_menu_prefix[type]);
-        }
-        else
-        {
-            grub_snprintf(node->menuentry, sizeof(node->menuentry),
-                "menuentry \"%s\" --class=%s {\n"
-                "  vt_set_fake_vlnk \"(%s)%s/%s\" %s %llu\n"
-                "  %s_common_menuentry\n"
-                "  vt_reset_fake_vlnk\n"
-                "}\n",
-                filename, g_menu_class[type],
-                g_menu_device, g_menu_path_buf, filename, g_menu_prefix[type], (ulonglong)fsize,
-                g_menu_prefix[type]);
-        }
-    }
-
-    node->prev = NULL;
-    node->next = g_browser_list;
-    if (g_browser_list)
-    {
-        g_browser_list->prev = node;
-    }
-    g_browser_list = node;
-
-    return 0;
-}
-
-static grub_err_t ventoy_browser_iso_part(void)
-{
-    char cfgfile[64];
-    char *buffer = NULL;
-    int pos = 0;
-    int buflen = 0;
-    int cfglen = 0;
-
-    cfglen = g_tree_script_pos - g_tree_script_pre;
-    buflen = cfglen + 512;
-    buffer = grub_malloc(buflen);
-    if (!buffer)
-    {
-        return 1;
-    }
-
-    if (g_tree_view_menu_style == 0)
-    {
-        pos = grub_snprintf(buffer, buflen, "menuentry \"%-10s [../]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                            "  echo 'return ...' \n}\n", "<--");        
-    }
-    else
-    {
-        pos = grub_snprintf(buffer, buflen, "menuentry \"[../]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                            "  echo 'return ...' \n}\n");        
-    }
-
-    grub_memcpy(buffer + pos, g_tree_script_buf + g_tree_script_pre, cfglen);
-    pos += cfglen;
-
-    grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%lx:size:%d", (ulong)buffer, pos);
-    grub_script_execute_sourcecode(cfgfile);
-
-    grub_free(buffer);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
-grub_err_t ventoy_cmd_browser_dir(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    int i;
-    grub_fs_t fs;
-    grub_device_t dev;
-    char cfgfile[64];
-    browser_node *node;
-    browser_mbuf mbuf;
-
-    (void)ctxt;
-    (void)argc;
-
-    if (args[2][0] == '/' && args[2][1] == 0)
-    {
-        grub_snprintf(cfgfile, sizeof(cfgfile), "(%s)", args[0]);
-        if (grub_strcmp(cfgfile, g_iso_path) == 0)
-        {
-            return ventoy_browser_iso_part();
-        }
-    }
-
-    if (!ventoy_browser_mbuf_alloc(&mbuf))
-    {
-        return 1;
-    }
-
-    fs = (grub_fs_t)grub_strtoul(args[1], NULL, 16);
-    if (!fs)
-    {
-        debug("Invalid fs %s\n", args[1]);
-        return 1;
-    }
-    
-    dev = grub_device_open(args[0]);
-    if (!dev)
-    {
-        debug("Failed to open device %s\n", args[0]);
-        return 1;
-    }
-    
-    g_menu_fs = fs;
-    g_menu_device = args[0];
-    g_menu_dev = dev;
-    g_browser_list = NULL;
-
-    if (args[2][0] == '/' && args[2][1] == 0)
-    {
-        g_menu_path_len = 0;
-        g_menu_path_buf[0] = 0;
-        fs->fs_dir(dev, "/", ventoy_browser_iterate_dir, NULL);            
-    }
-    else
-    {
-        g_menu_path_len = grub_snprintf(g_menu_path_buf, sizeof(g_menu_path_buf), "%s", args[2]);
-        fs->fs_dir(dev, g_menu_path_buf, ventoy_browser_iterate_dir, NULL); 
-    }
-    grub_device_close(dev);
-
-    if (g_tree_view_menu_style == 0)
-    {
-        browser_ssprintf(&mbuf, "menuentry \"%-10s [(%s)%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n", "<--", args[0], g_menu_path_buf);        
-    }
-    else
-    {
-        browser_ssprintf(&mbuf, "menuentry \"[(%s)%s/..]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n", args[0], g_menu_path_buf);        
-    }
-
-    for (i = 1; i >= 0; i--)
-    {
-        while (1)
-        {
-            node = ventoy_browser_find_top_node(i);
-            if (node)
-            {
-                browser_ssprintf(&mbuf, "%s", node->menuentry);
-                ventoy_browser_mbuf_extend(&mbuf);
-                
-                if (node->prev)
-                {
-                    node->prev->next = node->next;
-                }
-                if (node->next)
-                {
-                    node->next->prev = node->prev;
-                }
-
-                if (node == g_browser_list)
-                {
-                    g_browser_list = node->next;
-                }
-                grub_free(node);
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-    g_browser_list = NULL;
-    
-    grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%lx:size:%d", (ulong)mbuf.buf, mbuf.pos);
-    grub_script_execute_sourcecode(cfgfile);
-
-    ventoy_browser_mbuf_free(&mbuf);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
-grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    char cfgfile[64];
-    browser_mbuf mbuf;
-    
-    (void)ctxt;
-    (void)argc;
-    (void)args;
-
-    if (!ventoy_browser_mbuf_alloc(&mbuf))
-    {
-        return 1;
-    }
-
-    g_vtoy_dev = grub_env_get("vtoydev");
-
-    if (g_tree_view_menu_style == 0)
-    {
-        browser_ssprintf(&mbuf, "menuentry \"%-10s [%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n", "<--", 
-                         ventoy_get_vmenu_title("VTLANG_BROWER_RETURN"));        
-    }
-    else
-    {
-        browser_ssprintf(&mbuf, "menuentry \"[%s]\" --class=\"vtoyret\" VTOY_RET {\n  "
-                         "  echo 'return ...' \n}\n", 
-                         ventoy_get_vmenu_title("VTLANG_BROWER_RETURN"));      
-    }
-
-    grub_disk_dev_iterate(ventoy_browser_iterate_disk, &mbuf);
-
-    grub_snprintf(cfgfile, sizeof(cfgfile), "configfile mem:0x%lx:size:%d", (ulong)mbuf.buf, mbuf.pos);
-    grub_script_execute_sourcecode(cfgfile);
-
-    ventoy_browser_mbuf_free(&mbuf);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
@ -21,31 +21,23 @@
 #ifndef __VENTOY_DEF_H__
 #define __VENTOY_DEF_H__

-#define VTOY_MAX_DIR_DEPTH  32
-
 #define VTOY_MAX_SCRIPT_BUF    (4 * 1024 * 1024)

 #define VTOY_PART_BUF_LEN  (128 * 1024)

 #define VTOY_FILT_MIN_FILE_SIZE  32768

-#define VTOY_LINUX_SYSTEMD_MENU_MAX_BUF    16384
-
 #define VTOY_SIZE_1GB     1073741824
 #define VTOY_SIZE_1MB     (1024 * 1024)
 #define VTOY_SIZE_2MB     (2 * 1024 * 1024)
 #define VTOY_SIZE_4MB     (4 * 1024 * 1024)
 #define VTOY_SIZE_512KB   (512 * 1024)
 #define VTOY_SIZE_1KB     1024
-#define VTOY_SIZE_32KB    (32 * 1024)
-#define VTOY_SIZE_128KB   (128 * 1024)

 #define JSON_SUCCESS    0
 #define JSON_FAILED     1
 #define JSON_NOT_FOUND  2

-#define WINDATA_FLAG_TEMPLATE   1
-
 #define ulong unsigned long
 #define ulonglong  unsigned long long

@ -62,8 +54,6 @@

 #define VTOY_WARNING  "!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!"

-#define VTOY_CHKSUM_NUM  4
-
 #define VTOY_PLAT_I386_UEFI     0x49413332
 #define VTOY_PLAT_ARM64_UEFI    0x41413634
 #define VTOY_PLAT_X86_64_UEFI   0x55454649
@ -79,13 +69,6 @@
 #define VTOY_ARCH_CPIO  "ventoy_x86.cpio"
 #endif

-#define ventoy_left_key     "VTLE_LFT"
-#define ventoy_top_key      "VTLE_TOP"
-#define ventoy_color_key    "VTLE_CLR"
-
-#define ventoy_varg_4(arg) arg[0], arg[1], arg[2], arg[3]
-#define ventoy_varg_8(arg) arg[0], arg[1], arg[2], arg[3], arg[4], arg[5], arg[6], arg[7]
-
 #define VTOY_PWD_CORRUPTED(err) \
 {\
    grub_printf("\n\n Password corrupted, will reboot after 5 seconds.\n\n"); \
@ -95,38 +78,6 @@
    return (err);\
 }

-#define VTOY_APPEND_NEWBUF(buf) \
-{\
-    char *__c = buf;\
-    while (*__c)\
-    {\
-        newbuf[pos++] = *__c;\
-        __c++;\
-    }\
-}
-
-#define VTOY_SKIP_SPACE(s) \
-    while (ventoy_isspace(*s)) \
-    {\
-        s++;\
-    }
-
-#define VTOY_SKIP_SPACE_NEXT(s, initial) \
-    s += initial;\
-    while (ventoy_isspace(*s)) \
-    {\
-        s++;\
-    }
-
-#define VTOY_SKIP_SPACE_NEXT_EX(s, base, initial) \
-    s = base + initial;\
-    while (ventoy_isspace(*s)) \
-    {\
-        s++;\
-    }
-
-#define VTOY_GOTO_END(v)  ret = v; goto end
-
 typedef enum VTOY_FILE_FLT
 {
    VTOY_FILE_FLT_ISO = 0, /* .iso */
@ -243,18 +194,6 @@ typedef struct ventoy_iso9660_vd
    grub_uint32_t space;
 }ventoy_iso9660_vd;

-/* https://wiki.osdev.org/El-Torito */
-typedef struct boot_info_table
-{
-    grub_uint32_t bi_data0;
-    grub_uint32_t bi_data1;
-    grub_uint32_t bi_PrimaryVolumeDescriptor;
-    grub_uint32_t bi_BootFileLocation;
-    grub_uint32_t bi_BootFileLength;
-    grub_uint32_t bi_Checksum;
-    grub_uint8_t bi_Reserved[40];
-}boot_info_table;
-
 #pragma pack()

 #define img_type_start 0
@ -273,8 +212,6 @@ typedef struct img_info
    char name[256];

    const char *alias;
-    const char *tip1;
-    const char *tip2;
    const char *class;
    const char *menu_prefix;
    
@ -348,7 +285,6 @@ extern ventoy_guid  g_ventoy_guid;
 extern ventoy_img_chunk_list g_img_chunk_list;
 extern ventoy_img_chunk_list g_wimiso_chunk_list;
 extern char *g_wimiso_path;
-extern grub_uint32_t g_wimiso_size;
 extern char g_arch_mode_suffix[64];
 extern const char *g_menu_prefix[img_type_max];

@ -356,18 +292,8 @@ extern int g_ventoy_debug;
 void ventoy_debug(const char *fmt, ...);
 #define debug(fmt, args...) if (g_ventoy_debug) ventoy_debug("[VTOY]: "fmt, ##args)

-#define vtoy_ssprintf(buf, pos, fmt, args...) \
-    pos += grub_snprintf(buf + pos, VTOY_MAX_SCRIPT_BUF - pos, fmt, ##args)
-
-#define vtoy_len_ssprintf(buf, pos, len, fmt, args...) \
-    pos += grub_snprintf(buf + pos, len - pos, fmt, ##args)
-
-#define browser_ssprintf(mbuf, fmt, args...) \
-    (mbuf)->pos += grub_snprintf((mbuf)->buf + (mbuf)->pos, (mbuf)->max - (mbuf)->pos, fmt, ##args)
-
-#define vtoy_dummy_menuentry(buf, pos, len, title, class) \
-    vtoy_len_ssprintf(buf, pos, len, "menuentry \"%s\" --class=\"%s\" {\n  echo \"\"\n}\n", title, class)
-
+#define vtoy_ssprintf(buf, pos, fmt, ...) \
+    pos += grub_snprintf(buf + pos, VTOY_MAX_SCRIPT_BUF - pos, fmt, __VA_ARGS__)

 #define FLAG_HEADER_RESERVED          0x00000001
 #define FLAG_HEADER_COMPRESSION       0x00000002
@ -503,18 +429,6 @@ typedef struct wim_directory_entry
 /** No security information exists for this file */
 #define WIM_NO_SECURITY 0xffffffffUL

-typedef struct reg_vk
-{
-    grub_uint32_t res1;
-    grub_uint16_t sig;
-    grub_uint16_t namesize;
-    grub_uint32_t datasize;
-    grub_uint32_t dataoffset;
-    grub_uint32_t datatype;
-    grub_uint16_t flag;
-    grub_uint16_t res2;
-}reg_vk;
-
 #pragma pack()


@ -538,7 +452,6 @@ typedef struct wim_tail
    grub_uint8_t *jump_bin_data;
    grub_uint32_t bin_raw_len;
    grub_uint32_t bin_align_len;
-    grub_uint32_t windata_flag;

    grub_uint8_t *new_meta_data;
    grub_uint32_t new_meta_len;
@ -618,32 +531,8 @@ typedef struct plugin_entry
    const char *key;
    ventoy_plugin_entry_pf entryfunc;
    ventoy_plugin_check_pf checkfunc;
-    int flag;
 }plugin_entry;

-typedef struct replace_fs_dir
-{
-    grub_device_t dev;
-    grub_fs_t fs;
-    char fullpath[512];
-    char initrd[512];
-    int curpos;
-    int dircnt;
-    int filecnt;
-}replace_fs_dir;
-
-typedef struct chk_case_fs_dir
-{
-    grub_device_t dev;
-    grub_fs_t fs;
-}chk_case_fs_dir;
-
-int ventoy_str_all_digit(const char *str);
-int ventoy_str_all_alnum(const char *str);
-int ventoy_str_len_alnum(const char *str, int len);
-char * ventoy_str_basename(char *path);
-grub_err_t ventoy_env_int_set(const char *name, int value);
-int ventoy_str_chrcnt(const char *str, char c);
 int ventoy_strcmp(const char *pattern, const char *str);
 int ventoy_strncmp (const char *pattern, const char *str, grub_size_t n);
 void ventoy_fill_os_param(grub_file_t file, ventoy_os_param *param);
@ -655,19 +544,17 @@ grub_err_t ventoy_cmd_clear_initrd_list(grub_extcmd_context_t ctxt, int argc, ch
 grub_uint32_t ventoy_get_iso_boot_catlog(grub_file_t file);
 int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector);
 grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_linux_limine_menu(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_locate_initrd(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_initrd_count(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_valid_initrd_count(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_append_ext_sector(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_skip_svd(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_cpio_busybox_64(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_trailer_cpio(grub_extcmd_context_t ctxt, int argc, char **args);
 int ventoy_cpio_newc_fill_head(void *buf, int filesize, const void *filedata, const char *name);
 grub_file_t ventoy_grub_file_open(enum grub_file_type type, const char *fmt, ...);
 grub_uint64_t ventoy_grub_get_file_size(const char *fmt, ...);
+int ventoy_is_file_exist(const char *fmt, ...);
 int ventoy_is_dir_exist(const char *fmt, ...);
 int ventoy_fill_data(grub_uint32_t buflen, char *buffer);
 grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **args);
@ -677,7 +564,6 @@ grub_err_t ventoy_cmd_windows_chain_data(grub_extcmd_context_t ctxt, int argc, c
 grub_err_t ventoy_cmd_windows_wimboot_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_check_bootable(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_is_standard_winiso(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_dump_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_sel_wimboot(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_set_wim_prompt(grub_extcmd_context_t ctxt, int argc, char **args);
@ -861,8 +747,7 @@ typedef struct vhd_footer_t
    grub_uint8_t     savedst;      // Saved state
 }vhd_footer_t;

-#define VDI_IMAGE_FILE_INFO    "<<< Oracle VM VirtualBox Disk Image >>>\n"
-#define VDI_IMAGE_FILE_INFO2   "<<< Oracle VirtualBox Disk Image >>>\n"
+#define VDI_IMAGE_FILE_INFO   "<<< Oracle VM VirtualBox Disk Image >>>\n"

 /** Image signature. */
 #define VDI_IMAGE_SIGNATURE   (0xbeda107f)
@ -891,32 +776,18 @@ typedef struct ventoy_video_mode
 typedef struct file_fullpath
 {
    char path[256];
-    int vlnk_add;
 }file_fullpath;

-typedef struct theme_list
-{
-    file_fullpath theme;
-    struct theme_list *next;
-}theme_list;
-
-#define auto_install_type_file   0
-#define auto_install_type_parent 1
 typedef struct install_template
 {
-    int type;
    int pathlen;
    char isopath[256];

-    int timeout;
    int autosel;
    int cursel;
    int templatenum;
    file_fullpath *templatepath;

-    char *filebuf;
-    int filelen;
-
    struct install_template *next;
 }install_template;

@ -943,7 +814,6 @@ typedef struct persistence_config
    int pathlen;
    char isopath[256];

-    int timeout;
    int autosel;
    int cursel;
    int backendnum;
@ -965,20 +835,6 @@ typedef struct menu_alias
    struct menu_alias *next;
 }menu_alias;

-#define vtoy_tip_image_file 0
-#define vtoy_tip_directory  1
-typedef struct menu_tip
-{
-    int type;
-    int pathlen;
-    char isopath[256];
-    char tip1[1024];
-    char tip2[1024];
-
-    struct menu_tip *next;
-}menu_tip;
-
-
 #define vtoy_class_image_file  0
 #define vtoy_class_directory   1

@ -1006,11 +862,10 @@ typedef struct custom_boot
    struct custom_boot *next;
 }custom_boot;

-#define vtoy_max_replace_file_size  (1024 * 1024)
+#define vtoy_max_replace_file_size  (2 * 1024 * 1024)
 typedef struct conf_replace
 {
    int pathlen;
-    int img;
    char isopath[256];
    char orgconf[256];
    char newconf[256];
@ -1018,11 +873,8 @@ typedef struct conf_replace
    struct conf_replace *next;
 }conf_replace;

-#define injection_type_file   0
-#define injection_type_parent 1
 typedef struct injection_config
 {
-    int type;
    int pathlen;
    char isopath[256];
    char archive[256];
@ -1074,9 +926,7 @@ typedef struct menu_password
 }menu_password;

 extern int g_ventoy_menu_esc;
-extern int g_ventoy_secondary_menu_on;
 extern int g_ventoy_suppress_esc;
-extern int g_ventoy_suppress_esc_default;
 extern int g_ventoy_last_entry;
 extern int g_ventoy_memdisk_mode;
 extern int g_ventoy_iso_raw;
@ -1084,26 +934,20 @@ extern int g_ventoy_grub2_mode;
 extern int g_ventoy_wimboot_mode;
 extern int g_ventoy_iso_uefi_drv;
 extern int g_ventoy_case_insensitive;
-extern int g_ventoy_fn_mutex;
 extern grub_uint8_t g_ventoy_chain_type;
 extern int g_vhdboot_enable;
-extern int g_default_menu_mode;
-extern char g_ventoy_hotkey_tip[256];
-extern int g_ventoy_menu_refresh;

 #define VENTOY_IMG_WHITE_LIST   1
 #define VENTOY_IMG_BLACK_LIST   2
 extern int g_plugin_image_list;

 extern ventoy_gpt_info *g_ventoy_part_info;
-extern int g_conf_replace_count;
-extern grub_uint64_t g_conf_replace_offset[VTOY_MAX_CONF_REPLACE];
+extern grub_uint64_t g_conf_replace_offset;
 extern grub_uint64_t g_svd_replace_offset;
-extern conf_replace *g_conf_replace_node[VTOY_MAX_CONF_REPLACE];
-extern grub_uint8_t *g_conf_replace_new_buf[VTOY_MAX_CONF_REPLACE];
-extern int g_conf_replace_new_len[VTOY_MAX_CONF_REPLACE];
-extern int g_conf_replace_new_len_align[VTOY_MAX_CONF_REPLACE];
-extern int g_ventoy_disk_bios_id;
+extern conf_replace *g_conf_replace_node;
+extern grub_uint8_t *g_conf_replace_new_buf;
+extern int g_conf_replace_new_len;
+extern int g_conf_replace_new_len_align;
 extern grub_uint64_t g_ventoy_disk_size;
 extern grub_uint64_t g_ventoy_disk_part_size[2];
 extern grub_uint32_t g_ventoy_plat_data;
@ -1127,49 +971,39 @@ extern grub_uint32_t g_ventoy_plat_data;
 #define ventoy_syscall0(name) grub_##name()
 #define ventoy_syscall1(name, a) grub_##name(a)

-void ventoy_str_tolower(char *str);
-void ventoy_str_toupper(char *str);
 char * ventoy_get_line(char *start);
-char *ventoy_str_last(char *str, char ch);
 int ventoy_cmp_img(img_info *img1, img_info *img2);
 void ventoy_swap_img(img_info *img1, img_info *img2);
-char * ventoy_plugin_get_cur_install_template(const char *isopath, install_template **cur);
+char * ventoy_plugin_get_cur_install_template(const char *isopath);
 install_template * ventoy_plugin_find_install_template(const char *isopath);
 persistence_config * ventoy_plugin_find_persistent(const char *isopath);
 grub_uint64_t ventoy_get_vtoy_partsize(int part);
 void ventoy_plugin_dump_injection(void);
 void ventoy_plugin_dump_auto_install(void);
+int ventoy_fill_windows_rtdata(void *buf, char *isopath);
 int ventoy_plugin_get_persistent_chunklist(const char *isopath, int index, ventoy_img_chunk_list *chunk_list);
 const char * ventoy_plugin_get_injection(const char *isopath);
 const char * ventoy_plugin_get_menu_alias(int type, const char *isopath);
-const menu_tip * ventoy_plugin_get_menu_tip(int type, const char *isopath);
 const char * ventoy_plugin_get_menu_class(int type, const char *name, const char *path);
 int ventoy_plugin_check_memdisk(const char *isopath);
 int ventoy_plugin_get_image_list_index(int type, const char *name);
-int ventoy_plugin_find_conf_replace(const char *iso, conf_replace *nodes[VTOY_MAX_CONF_REPLACE]);
+conf_replace * ventoy_plugin_find_conf_replace(const char *iso);
 dud * ventoy_plugin_find_dud(const char *iso);
 int ventoy_plugin_load_dud(dud *node, const char *isopart);
 int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
 int ventoy_check_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, grub_disk_addr_t start);
 void ventoy_plugin_dump_persistence(void);
-grub_err_t ventoy_cmd_set_theme(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_set_theme_path(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_select_theme_cfg(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_check_password(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_linux_get_main_initrd_index(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_collect_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_wim_patch_count(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_locate_wim_patch(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_sel_winpe_wim(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char **args);
 int ventoy_get_disk_guid(const char *filename, grub_uint8_t *guid, grub_uint8_t *signature);
 grub_err_t ventoy_cmd_unix_reset(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_unix_check_vlnk(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_unix_replace_grub_conf(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_replace_ko(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_unix_ko_fillmap(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_fill_image_desc(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_gzip_newko(grub_extcmd_context_t ctxt, int argc, char **args);
 grub_err_t ventoy_cmd_unix_freebsd_ver(grub_extcmd_context_t ctxt, int argc, char **args);
@ -1196,127 +1030,5 @@ int ventoy_chain_file_read(const char *path, int offset, int len, void *buf);

 #define VTOY_CMD_CHECK(a) if (33554432 != g_ventoy_disk_part_size[a]) ventoy_syscall0(exit)

-#define vtoy_theme_random_boot_second  0
-#define vtoy_theme_random_boot_day     1
-#define vtoy_theme_random_boot_month   2
-
-#define ventoy_env_export(env, name) \
-{\
-    grub_env_set((env), (name));\
-    grub_env_export(env);\
-}
-
-#define ret_goto_end(a) ret = a; goto end;
-
-extern ventoy_grub_param *g_grub_param;
-
-#pragma pack(1)
-#define VENTOY_UNIX_SEG_MAGIC0    0x11223344
-#define VENTOY_UNIX_SEG_MAGIC1    0x55667788
-#define VENTOY_UNIX_SEG_MAGIC2    0x99aabbcc
-#define VENTOY_UNIX_SEG_MAGIC3    0xddeeff00
-#define VENTOY_UNIX_MAX_SEGNUM    40960
-struct g_ventoy_seg {
-    grub_uint64_t seg_start_bytes;
-    grub_uint64_t seg_end_bytes;
-};
-
-struct g_ventoy_map{
-    grub_uint32_t magic1[4];
-    grub_uint32_t magic2[4];
-    grub_uint64_t segnum;
-    grub_uint64_t disksize;
-    grub_uint8_t diskuuid[16];
-    struct g_ventoy_seg seglist[VENTOY_UNIX_MAX_SEGNUM];
-    grub_uint32_t magic3[4];
-};
-#pragma pack()
-
-typedef struct ventoy_vlnk_part
-{
-    grub_uint32_t disksig;
-    grub_uint64_t partoffset;
-    char disk[64];
-    char device[64];
-    grub_device_t dev;
-    grub_fs_t fs;
-    int probe;
-    struct ventoy_vlnk_part *next;
-}ventoy_vlnk_part;
-
-
-typedef struct browser_mbuf
-{
-    int max;
-    int pos;
-    char *buf;
-}browser_mbuf;
-
-typedef struct browser_node
-{
-    int  dir;
-    char menuentry[1024];
-    char filename[512];
-    struct browser_node *prev;
-    struct browser_node *next;
-}browser_node;
-
-typedef struct var_node
-{
-    char var[128];
-    char val[256];
-
-    struct var_node *next;
-}var_node;
-
-typedef struct systemd_menu_ctx
-{
-    char *dev;
-    char *buf;
-    int pos;
-    int len;
-}systemd_menu_ctx;
-
-typedef struct global_var_cfg
-{
-    const char *name;
-    const char *defval;
-    char *value;
-}global_var_cfg;
-
-typedef struct ctrl_var_cfg
-{
-    const char *name;
-    int value;
-}ctrl_var_cfg;
-
-#define vtoy_check_goto_out(p)  if (!p) goto out
-
-extern char *g_tree_script_buf;
-extern int g_tree_script_pos;
-extern int g_tree_script_pre;
-extern int g_tree_view_menu_style;
-extern int g_sort_case_sensitive;
-extern int g_wimboot_enable;
-extern int g_filt_dot_underscore_file;
-extern int g_filt_trash_dir;
-extern int g_vtoy_file_flt[VTOY_FILE_FLT_BUTT];
-extern const char *g_menu_class[img_type_max];
-extern char g_iso_path[256];
-int ventoy_add_vlnk_file(char *dir, const char *name);
-grub_err_t ventoy_cmd_browser_dir(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **args);
-int ventoy_get_fs_type(const char *fs);
-int ventoy_img_name_valid(const char *filename, grub_size_t namelen);
-void * ventoy_alloc_chain(grub_size_t size);
-int ventoy_plugin_load_menu_lang(int init, const char *lang);
-const char *ventoy_get_vmenu_title(const char *vMenu);
-grub_err_t ventoy_cmd_cur_menu_lang(grub_extcmd_context_t ctxt, int argc, char **args);
-extern int ventoy_menu_push_key(int code);
-int ventoy_ctrl_var_init(void);
-int ventoy_global_var_init(void);
-grub_err_t ventoy_cmd_push_menulang(grub_extcmd_context_t ctxt, int argc, char **args);
-grub_err_t ventoy_cmd_pop_menulang(grub_extcmd_context_t ctxt, int argc, char **args);
-
 #endif /* __VENTOY_DEF_H__ */

--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_json.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_json.c
@ -152,23 +152,6 @@ static int vtoy_json_parse_string
        return JSON_FAILED;
    }

-    if (*(pcPos - 1) == '\\')
-    {
-        for (pcPos++; *pcPos; pcPos++)
-        {
-            if (*pcPos == '"' && *(pcPos - 1) != '\\')
-            {
-                break;
-            }
-        }
-        
-        if (*pcPos == 0 || pcPos < pcTmp)
-        {
-            json_debug("Invalid quotes string %s.", pcData);
-            return JSON_FAILED;
-        }
-    }
-
    *ppcEnd = pcPos + 1;
    uiLen = (grub_uint32_t)(unsigned long)(pcPos - pcTmp);    
    
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
@ -38,9 +38,6 @@

 GRUB_MOD_LICENSE ("GPLv3+");

-#define VTOY_APPEND_EXT_SIZE 4096
-static int g_append_ext_sector = 0;
-
 char * ventoy_get_line(char *start)
 {
    if (start == NULL)
@ -177,7 +174,10 @@ static grub_err_t ventoy_isolinux_initrd_collect(grub_file_t file, const char *p
    {
        nextline = ventoy_get_line(start);

-        VTOY_SKIP_SPACE(start);
+        while (ventoy_isspace(*start))
+        {
+            start++;
+        }

        offset = 7; // strlen("initrd=") or "INITRD " or "initrd "
        pos = grub_strstr(start, "initrd=");
@ -330,84 +330,10 @@ end:
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-static int ventoy_linux_initrd_collect_hook(const char *filename, const struct grub_dirhook_info *info, void *data)
-{
-    int len;
-    initrd_info *img = NULL;
-    
-    (void)data;
-
-    if (0 == info->dir)
-    {
-        if (grub_strncmp(filename, "initrd", 6) == 0)
-        {
-            len = (int)grub_strlen(filename);
-            if (grub_strcmp(filename + len - 4, ".img") == 0)
-            {
-                img = grub_zalloc(sizeof(initrd_info));
-                if (img)
-                {
-                    grub_snprintf(img->name, sizeof(img->name), "/boot/%s", filename);
-
-                    if (ventoy_find_initrd_by_name(g_initrd_img_list, img->name))
-                    {
-                        grub_free(img);
-                    }
-                    else
-                    {                        
-                        if (g_initrd_img_list)
-                        {
-                            img->prev = g_initrd_img_tail;
-                            g_initrd_img_tail->next = img;
-                        }
-                        else
-                        {
-                            g_initrd_img_list = img;
-                        }
-
-                        g_initrd_img_tail = img;
-                        g_initrd_img_count++;
-                    }
-                }
-            }
-        }
-    }
-
-    return 0;
-}
-
-static int ventoy_linux_collect_boot_initrds(void)
-{
-    grub_fs_t fs;
-    grub_device_t dev = NULL;
-
-    dev = grub_device_open("loop");
-    if (!dev)
-    {
-        debug("failed to open device loop\n");
-        goto end;        
-    }
-
-    fs = grub_fs_probe(dev);
-    if (!fs)
-    {
-        debug("failed to probe fs %d\n", grub_errno);
-        goto end;
-    }
-
-    fs->fs_dir(dev, "/boot", ventoy_linux_initrd_collect_hook, NULL);
-
-end:
-    return 0;    
-}
-
 static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
 {
    int i = 0;
-    int len = 0;
    int dollar = 0;
-    int quotation = 0;
-    int initrd_dollar = 0;
    grub_file_t file = NULL;
    char *buf = NULL;
    char *start = NULL;
@ -435,7 +361,10 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
    {
        nextline = ventoy_get_line(start);

-        VTOY_SKIP_SPACE(start);
+        while (ventoy_isspace(*start))
+        {
+            start++;
+        }

        if (grub_strncmp(start, "initrd", 6) != 0)
        {
@ -448,11 +377,8 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
            start++;
        }

-        VTOY_SKIP_SPACE(start);
-
-        if (*start == '"')
+        while (ventoy_isspace(*start))
        {
-            quotation = 1;
            start++;
        }

@ -474,29 +400,6 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
                }
            }

-            if (quotation)
-            {
-                len = (int)grub_strlen(img->name);
-                if (len > 2 && img->name[len - 1] == '"')
-                {
-                    img->name[len - 1] = 0;
-                }
-                debug("Remove quotation <%s>\n", img->name);
-            }
-
-            /* special process for /boot/initrd$XXX.img */
-            if (dollar == 1)
-            {
-                if (grub_strncmp(img->name, "/boot/initrd$", 13) == 0)
-                {
-                    len = (int)grub_strlen(img->name);
-                    if (grub_strcmp(img->name + len - 4, ".img") == 0)
-                    {
-                        initrd_dollar++;                        
-                    }                    
-                }
-            }
-
            if (dollar == 1 || ventoy_find_initrd_by_name(g_initrd_img_list, img->name))
            {
                grub_free(img);
@ -519,7 +422,10 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)

            if (*start == ' ' || *start == '\t')
            {
-                VTOY_SKIP_SPACE(start);
+                while (ventoy_isspace(*start))
+                {
+                    start++;
+                }
            }
            else
            {
@ -531,12 +437,6 @@ static grub_err_t ventoy_grub_cfg_initrd_collect(const char *fileName)
    grub_free(buf);
    grub_file_close(file);

-    if (initrd_dollar > 0 && grub_strncmp(fileName, "(loop)/", 7) == 0)
-    {
-        debug("collect initrd variable %d\n", initrd_dollar);
-        ventoy_linux_collect_boot_initrds();
-    }
-
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

@ -733,21 +633,9 @@ int ventoy_cpio_newc_fill_head(void *buf, int filesize, const void *filedata, co

 static grub_uint32_t ventoy_linux_get_virt_chunk_count(void)
 {
-    int i;
    grub_uint32_t count = g_valid_initrd_count;
    
-    if (g_conf_replace_count > 0)
-    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {
-                count++;
-            }
-        }
-    }
-    
-    if (g_append_ext_sector > 0)
+    if (g_conf_replace_offset > 0)
    {
        count++;
    }
@ -757,25 +645,13 @@ static grub_uint32_t ventoy_linux_get_virt_chunk_count(void)

 static grub_uint32_t ventoy_linux_get_virt_chunk_size(void)
 {
-    int i;
    grub_uint32_t size;
    
    size = (sizeof(ventoy_virt_chunk) + g_ventoy_cpio_size) * g_valid_initrd_count;
-
-    if (g_conf_replace_count > 0)
-    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {
-                size += sizeof(ventoy_virt_chunk) + g_conf_replace_new_len_align[i];
-            }
-        }
-    }
    
-    if (g_append_ext_sector > 0)
+    if (g_conf_replace_offset > 0)
    {
-        size += sizeof(ventoy_virt_chunk) + VTOY_APPEND_EXT_SIZE;
+        size += sizeof(ventoy_virt_chunk) + g_conf_replace_new_len_align;
    }

    return size;
@ -783,9 +659,7 @@ static grub_uint32_t ventoy_linux_get_virt_chunk_size(void)

 static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_head *chain)
 {
-    int i = 0;
    int id = 0;
-    int virtid = 0;
    initrd_info *node;
    grub_uint64_t sector;
    grub_uint32_t offset;
@ -793,7 +667,6 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
    grub_uint32_t initrd_secs;
    char *override;
    ventoy_virt_chunk *cur;
-    ventoy_grub_param_file_replace *replace = NULL;
    char name[32];

    override = (char *)chain + chain->virt_chunk_offset;
@ -834,13 +707,11 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
        offset += g_ventoy_cpio_size;
        sector += cpio_secs + initrd_secs;
        cur++;
-        virtid++;
    }

-    /* Lenovo EasyStartup need an addional sector for boundary check */
-    if (g_append_ext_sector > 0)
+    if (g_conf_replace_offset > 0)
    {
-        cpio_secs = VTOY_APPEND_EXT_SIZE / 2048;
+        cpio_secs = g_conf_replace_new_len_align / 2048;
    
        cur->mem_sector_start   = sector;
        cur->mem_sector_end     = cur->mem_sector_start + cpio_secs;
@ -849,47 +720,13 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
        cur->remap_sector_end   = 0;
        cur->org_sector_start   = 0;

-        grub_memset(override + offset, 0, VTOY_APPEND_EXT_SIZE);
+        grub_memcpy(override + offset, g_conf_replace_new_buf, g_conf_replace_new_len);

-        chain->virt_img_size_in_bytes += VTOY_APPEND_EXT_SIZE;
+        chain->virt_img_size_in_bytes += g_conf_replace_new_len_align;

-        offset += VTOY_APPEND_EXT_SIZE;
+        offset += g_conf_replace_new_len_align;
        sector += cpio_secs;
        cur++;
-        virtid++;
-    }
-
-    if (g_conf_replace_count > 0)
-    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {
-                cpio_secs = g_conf_replace_new_len_align[i] / 2048;
-            
-                cur->mem_sector_start   = sector;
-                cur->mem_sector_end     = cur->mem_sector_start + cpio_secs;
-                cur->mem_sector_offset  = offset;
-                cur->remap_sector_start = 0;
-                cur->remap_sector_end   = 0;
-                cur->org_sector_start   = 0;
-
-                grub_memcpy(override + offset, g_conf_replace_new_buf[i], g_conf_replace_new_len[i]);
-
-                chain->virt_img_size_in_bytes += g_conf_replace_new_len_align[i];
-
-                replace = g_grub_param->img_replace + i;
-                if (replace->magic == GRUB_IMG_REPLACE_MAGIC)
-                {
-                    replace->new_file_virtual_id = virtid;
-                }
-
-                offset += g_conf_replace_new_len_align[i];
-                sector += cpio_secs;
-                cur++;
-                virtid++;
-            }
-        }
    }

    return;
@ -897,18 +734,11 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_

 static grub_uint32_t ventoy_linux_get_override_chunk_count(void)
 {
-    int i;
    grub_uint32_t count = g_valid_initrd_count;
-
-    if (g_conf_replace_count > 0)
+    
+    if (g_conf_replace_offset > 0)
    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {
-                count++;
-            }
-        }
+        count++;
    }

    if (g_svd_replace_offset > 0)
@ -921,18 +751,11 @@ static grub_uint32_t ventoy_linux_get_override_chunk_count(void)

 static grub_uint32_t ventoy_linux_get_override_chunk_size(void)
 {
-    int i;
    int count = g_valid_initrd_count;
-
-    if (g_conf_replace_count > 0)
+    
+    if (g_conf_replace_offset > 0)
    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {
-                count++;
-            }
-        }
+        count++;
    }

    if (g_svd_replace_offset > 0)
@ -945,7 +768,6 @@ static grub_uint32_t ventoy_linux_get_override_chunk_size(void)

 static void ventoy_linux_fill_override_data(    grub_uint64_t isosize, void *override)
 {
-    int i;
    initrd_info *node;
    grub_uint32_t mod;
    grub_uint32_t newlen;
@ -1000,29 +822,23 @@ static void ventoy_linux_fill_override_data(    grub_uint64_t isosize, void *ove
        cur++;
    }

-    if (g_conf_replace_count > 0)
-    {
-        for (i = 0; i < g_conf_replace_count; i++)
-        {
-            if (g_conf_replace_offset[i] > 0)
-            {        
-                cur->img_offset = g_conf_replace_offset[i];
-                cur->override_size = sizeof(ventoy_iso9660_override);
+    if (g_conf_replace_offset > 0)
+    {        
+        cur->img_offset = g_conf_replace_offset;
+        cur->override_size = sizeof(ventoy_iso9660_override);

-                newlen = (grub_uint32_t)(g_conf_replace_new_len[i]);
+        newlen = (grub_uint32_t)(g_conf_replace_new_len);

-                dirent = (ventoy_iso9660_override *)cur->override_data;
-                dirent->first_sector    = (grub_uint32_t)sector;
-                dirent->size            = newlen;
-                dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
-                dirent->size_be         = grub_swap_bytes32(dirent->size);
+        dirent = (ventoy_iso9660_override *)cur->override_data;
+        dirent->first_sector    = (grub_uint32_t)sector;
+        dirent->size            = newlen;
+        dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
+        dirent->size_be         = grub_swap_bytes32(dirent->size);

-                sector += (dirent->size + 2047) / 2048;
-                cur++;
-            }
-        }
+        sector += (dirent->size + 2047) / 2048;
+        cur++;
    }
-
+    
    if (g_svd_replace_offset > 0)
    {        
        cur->img_offset = g_svd_replace_offset;
@ -1099,7 +915,6 @@ static grub_err_t ventoy_linux_locate_initrd(int filt, int *filtcnt)
        if (filtbysize 
            && (NULL == grub_strstr(node->name, "minirt.gz"))
            && (NULL == grub_strstr(node->name, "initrd.xz"))
-            && (NULL == grub_strstr(node->name, "initrd.gz"))
            )
        {
            if (filt > 0 && file->size <= g_ventoy_cpio_size + 2048)
@ -1111,12 +926,6 @@ static grub_err_t ventoy_linux_locate_initrd(int filt, int *filtcnt)
            }
        }

-        /* skip hdt.img */
-        if (file->size <= VTOY_SIZE_1MB && grub_strcmp(node->name, "/boot/hdt.img") == 0)
-        {
-            continue;
-        }
-
        if (grub_strcmp(file->fs->name, "iso9660") == 0)
        {
            node->iso_type = 0;
@ -1292,24 +1101,6 @@ grub_err_t ventoy_cmd_skip_svd(grub_extcmd_context_t ctxt, int argc, char **args
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-grub_err_t ventoy_cmd_append_ext_sector(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    (void)ctxt;
-    (void)argc;
-    (void)args;
-
-    if (args[0][0] == '1')
-    {
-        g_append_ext_sector = 1;        
-    }
-    else
-    {
-        g_append_ext_sector = 0;
-    }
-
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
 grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **args)
 {
    int i;
@ -1335,7 +1126,6 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
    grub_file_t file;
    grub_file_t archfile;
    grub_file_t tmpfile;
-    install_template *template_node = NULL;
    ventoy_img_chunk_list chunk_list;

    (void)ctxt;
@ -1382,17 +1172,26 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
        persistent_buf = (char *)(chunk_list.chunk);
    }

-    template_file = ventoy_plugin_get_cur_install_template(args[1], &template_node);
+    template_file = ventoy_plugin_get_cur_install_template(args[1]);
    if (template_file)
    {
-        debug("auto install template: <%s> <addr:%p> <len:%d>\n", 
-            template_file, template_node->filebuf, template_node->filelen);
-        
-        template_size = template_node->filelen;
-        template_buf = grub_malloc(template_size);
-        if (template_buf)
+        debug("auto install template: <%s>\n", template_file);
+        tmpfile = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[2], template_file);
+        if (tmpfile)
        {
-            grub_memcpy(template_buf, template_node->filebuf, template_size);
+            debug("auto install script size %d\n", (int)tmpfile->size);
+            template_size = tmpfile->size;
+            template_buf = grub_malloc(template_size);
+            if (template_buf)
+            {
+                grub_file_read(tmpfile, template_buf, template_size);
+            }
+
+            grub_file_close(tmpfile);
+        }
+        else
+        {
+            debug("Failed to open install script %s%s\n", args[2], template_file);
        }
    }
    else
@ -1479,14 +1278,15 @@ grub_err_t ventoy_cmd_load_cpio(grub_extcmd_context_t ctxt, int argc, char **arg
    {
        headlen = ventoy_cpio_newc_fill_head(buf, template_size, template_buf, "ventoy/autoinstall");
        buf += headlen + ventoy_align(template_size, 4);
-        grub_check_free(template_buf);
    }

    if (persistent_size > 0 && persistent_buf)
    {
        headlen = ventoy_cpio_newc_fill_head(buf, persistent_size, persistent_buf, "ventoy/ventoy_persistent_map");
        buf += headlen + ventoy_align(persistent_size, 4);
-        grub_check_free(persistent_buf);
+
+        grub_free(persistent_buf);
+        persistent_buf = NULL;
    }

    if (injection_size > 0 && injection_buf)
@ -1561,6 +1361,7 @@ grub_err_t ventoy_cmd_trailer_cpio(grub_extcmd_context_t ctxt, int argc, char **
    grub_uint8_t *bufend;
    cpio_newc_header *head;
    grub_file_t file;
+    char value[64];
    const grub_uint8_t trailler[124] = {
        0x30, 0x37, 0x30, 0x37, 0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
@ -1631,15 +1432,18 @@ grub_err_t ventoy_cmd_trailer_cpio(grub_extcmd_context_t ctxt, int argc, char **
            name = (char *)(head + 1);
        }
    }
-
-    ventoy_memfile_env_set("ventoy_cpio", g_ventoy_cpio_buf, (ulonglong)bufsize);
+    
+    grub_snprintf(value, sizeof(value), "0x%llx", (ulonglong)(ulong)g_ventoy_cpio_buf);
+    ventoy_set_env("ventoy_cpio_addr", value);
+    grub_snprintf(value, sizeof(value), "%d", bufsize);
+    ventoy_set_env("ventoy_cpio_size", value);

    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

+
 grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, char **args)
 {
-    int len = 0;
    int ventoy_compatible = 0;
    grub_uint32_t size = 0;
    grub_uint64_t isosize = 0;
@ -1654,6 +1458,7 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
    const char *pLastChain = NULL;
    const char *compatible;
    ventoy_chain_head *chain;
+    char envbuf[64];
    
    (void)ctxt;
    (void)argc;
@ -1678,31 +1483,23 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha

    isosize = file->size;

-    len = (int)grub_strlen(args[0]);
-    if (len >= 4 && 0 == grub_strcasecmp(args[0] + len - 4, ".img"))
+    boot_catlog = ventoy_get_iso_boot_catlog(file);
+    if (boot_catlog)
    {
-        debug("boot catlog %u for img file\n", boot_catlog);
+        if (ventoy_is_efi_os() && (!ventoy_has_efi_eltorito(file, boot_catlog)))
+        {
+            grub_env_set("LoadIsoEfiDriver", "on");
+        }
    }
    else
    {
-        boot_catlog = ventoy_get_iso_boot_catlog(file);
-        if (boot_catlog)
+        if (ventoy_is_efi_os())
        {
-            if (ventoy_is_efi_os() && (!ventoy_has_efi_eltorito(file, boot_catlog)))
-            {
-                grub_env_set("LoadIsoEfiDriver", "on");
-            }
+            grub_env_set("LoadIsoEfiDriver", "on");
        }
        else
        {
-            if (ventoy_is_efi_os())
-            {
-                grub_env_set("LoadIsoEfiDriver", "on");
-            }
-            else
-            {
-                return grub_error(GRUB_ERR_BAD_ARGUMENT, "File %s is not bootable", args[0]);
-            }
+            return grub_error(GRUB_ERR_BAD_ARGUMENT, "File %s is not bootable", args[0]);
        }
    }
    
@ -1733,15 +1530,18 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
        }
    }

-    chain = ventoy_alloc_chain(size);
+    chain = grub_malloc(size);
    if (!chain)
    {
-        grub_printf("Failed to alloc chain linux memory size %u\n", size);
+        grub_printf("Failed to alloc chain memory size %u\n", size);
        grub_file_close(file);
        return 1;
    }

-    ventoy_memfile_env_set("vtoy_chain_mem", chain, (ulonglong)size);
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (unsigned long)chain);
+    grub_env_set("vtoy_chain_mem_addr", envbuf);
+    grub_snprintf(envbuf, sizeof(envbuf), "%u", size);
+    grub_env_set("vtoy_chain_mem_size", envbuf);

    grub_memset(chain, 0, sizeof(ventoy_chain_head));

@ -1792,300 +1592,3 @@ grub_err_t ventoy_cmd_linux_chain_data(grub_extcmd_context_t ctxt, int argc, cha
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-static char *ventoy_systemd_conf_tag(char *buf, const char *tag, int optional)
-{
-    int taglen = 0;
-    char *start = NULL;
-    char *nextline = NULL;
-
-    taglen = grub_strlen(tag);
-    for (start = buf; start; start = nextline)
-    {
-        nextline = ventoy_get_line(start);
-        VTOY_SKIP_SPACE(start);
-
-        if (grub_strncmp(start, tag, taglen) == 0 && (start[taglen] == ' ' || start[taglen] == '\t'))
-        {
-            start += taglen;
-            VTOY_SKIP_SPACE(start); 
-            return start;
-        }
-    }
-
-    if (optional == 0)
-    {
-        debug("tag<%s> NOT found\n", tag);        
-    }
-    return NULL;
-}
-
-static int ventoy_systemd_conf_hook(const char *filename, const struct grub_dirhook_info *info, void *data)
-{
-    int oldpos = 0;
-    char *tag = NULL;
-    char *bkbuf = NULL;
-    char *filebuf = NULL;
-    grub_file_t file = NULL;
-    systemd_menu_ctx *ctx = (systemd_menu_ctx *)data;
-
-    debug("ventoy_systemd_conf_hook %s\n", filename);
-
-    if (info->dir || NULL == grub_strstr(filename, ".conf"))
-    {
-        return 0;
-    }
-
-
-    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s/loader/entries/%s", ctx->dev, filename);
-    if (!file)
-    {
-        return 0;
-    }
-
-    filebuf = grub_zalloc(2 * file->size + 8);
-    if (!filebuf)
-    {
-        goto out;
-    }
-
-    bkbuf = filebuf + file->size + 4;
-    grub_file_read(file, bkbuf, file->size);
-
-    oldpos = ctx->pos;
-
-    /* title --> menuentry */
-    grub_memcpy(filebuf, bkbuf, file->size);
-    tag = ventoy_systemd_conf_tag(filebuf, "title", 0);
-    vtoy_check_goto_out(tag);
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "menuentry \"%s\" {\n", tag);
-
-    /* linux xxx */
-    grub_memcpy(filebuf, bkbuf, file->size);
-    tag = ventoy_systemd_conf_tag(filebuf, "linux", 0);
-    if (!tag)
-    {
-        ctx->pos = oldpos;
-        goto out;
-    }
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading kernel ...\"\n  linux %s ", tag);
-
-    /* kernel options */
-    grub_memcpy(filebuf, bkbuf, file->size);
-    tag = ventoy_systemd_conf_tag(filebuf, "options", 0);
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "%s \n", tag ? tag : "");
-
-    
-    /* initrd xxx xxx xxx */
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "  echo \"Downloading initrd ...\"\n  initrd ");
-    grub_memcpy(filebuf, bkbuf, file->size);
-    tag = ventoy_systemd_conf_tag(filebuf, "initrd", 1);
-    while (tag)
-    {
-        vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "%s ", tag);
-        tag = ventoy_systemd_conf_tag(tag + grub_strlen(tag) + 1, "initrd", 1);
-    }
-
-    vtoy_len_ssprintf(ctx->buf, ctx->pos, ctx->len, "\n  boot\n}\n");
-
-out:
-    grub_check_free(filebuf);
-    grub_file_close(file);
-    return 0;
-}
-
-grub_err_t ventoy_cmd_linux_systemd_menu(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    static char *buf = NULL;
-    grub_fs_t fs;
-    char *device_name = NULL;
-    grub_device_t dev = NULL;
-    systemd_menu_ctx ctx;
-    
-    (void)ctxt;
-    (void)argc;
-
-    if (!buf)
-    {
-        buf = grub_malloc(VTOY_LINUX_SYSTEMD_MENU_MAX_BUF);
-        if (!buf)
-        {
-            goto end;
-        }        
-    }
-
-    device_name = grub_file_get_device_name(args[0]);
-    if (!device_name)
-    {
-        debug("failed to get device name %s\n", args[0]);
-        goto end;
-    }
-
-    dev = grub_device_open(device_name);
-    if (!dev)
-    {
-        debug("failed to open device %s\n", device_name);
-        goto end;        
-    }
-
-    fs = grub_fs_probe(dev);
-    if (!fs)
-    {
-        debug("failed to probe fs %d\n", grub_errno);
-        goto end;
-    }
-
-    ctx.dev = args[0];
-    ctx.buf = buf;
-    ctx.pos = 0;
-    ctx.len = VTOY_LINUX_SYSTEMD_MENU_MAX_BUF;
-    fs->fs_dir(dev, "/loader/entries", ventoy_systemd_conf_hook, &ctx);
-
-    ventoy_memfile_env_set(args[1], buf, (ulonglong)(ctx.pos));
-
-end:
-    grub_check_free(device_name);
-    check_free(dev, grub_device_close);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
-static int ventoy_limine_path_convert(char *path)
-{
-    char newpath[256] = {0};
-
-    if (grub_strncmp(path, "boot://2/", 9) == 0)
-    {
-        grub_snprintf(newpath, sizeof(newpath), "(vtimghd,2)/%s", path + 9);
-    }
-    else if (grub_strncmp(path, "boot://1/", 9) == 0)
-    {
-        grub_snprintf(newpath, sizeof(newpath), "(vtimghd,1)/%s", path + 9);
-    }
-
-    if (newpath[0])
-    {
-        grub_snprintf(path, 1024, "%s", newpath);
-    }
-
-    return 0;
-}
-
-grub_err_t ventoy_cmd_linux_limine_menu(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    int pos = 0;
-    int sub = 0;
-    int len = VTOY_LINUX_SYSTEMD_MENU_MAX_BUF;
-    char *filebuf = NULL;
-    char *start = NULL;
-    char *nextline = NULL;
-    grub_file_t file = NULL;
-    char *title = NULL;
-    char *kernel = NULL;
-    char *initrd = NULL;
-    char *param = NULL;
-    static char *buf = NULL;
-    
-    (void)ctxt;
-    (void)argc;
-
-    if (!buf)
-    {
-        buf = grub_malloc(len + 4 * 1024);
-        if (!buf)
-        {
-            goto end;
-        }        
-    }
-
-    title = buf + len;
-    kernel = title + 1024;
-    initrd = kernel + 1024;
-    param = initrd + 1024;
-    
-    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, args[0]);
-    if (!file)
-    {
-        return 0;
-    }
-
-    filebuf = grub_zalloc(file->size + 8);
-    if (!filebuf)
-    {
-        goto end;
-    }
-
-    grub_file_read(file, filebuf, file->size);
-    grub_file_close(file);
-
-    
-    title[0] = kernel[0] = initrd[0] = param[0] = 0;
-    for (start = filebuf; start; start = nextline)
-    {
-        nextline = ventoy_get_line(start);
-        VTOY_SKIP_SPACE(start);
-
-        if (start[0] == ':')
-        {
-            if (start[1] == ':')
-            {
-                grub_snprintf(title, 1024, "%s", start + 2);
-            }
-            else
-            {
-                if (sub)
-                {
-                    vtoy_len_ssprintf(buf, pos, len, "}\n");
-                    sub = 0;
-                }
-
-                if (nextline && nextline[0] == ':' && nextline[1] == ':')
-                {
-                    vtoy_len_ssprintf(buf, pos, len, "submenu \"[+] %s\" {\n", start + 2);
-                    sub = 1;
-                    title[0] = 0;
-                }
-                else
-                {
-                    grub_snprintf(title, 1024, "%s", start + 1);                    
-                }
-            }
-        }
-        else if (grub_strncmp(start, "KERNEL_PATH=", 12) == 0)
-        {
-            grub_snprintf(kernel, 1024, "%s", start + 12);
-        }
-        else if (grub_strncmp(start, "MODULE_PATH=", 12) == 0)
-        {
-            grub_snprintf(initrd, 1024, "%s", start + 12);
-        }
-        else if (grub_strncmp(start, "KERNEL_CMDLINE=", 15) == 0)
-        {
-            grub_snprintf(param, 1024, "%s", start + 15);
-        }
-
-        if (title[0] && kernel[0] && initrd[0] && param[0])
-        {
-            ventoy_limine_path_convert(kernel);
-            ventoy_limine_path_convert(initrd);
-        
-            vtoy_len_ssprintf(buf, pos, len, "menuentry \"%s\" {\n", title);
-            vtoy_len_ssprintf(buf, pos, len, "  echo \"Downloading kernel ...\"\n  linux %s %s\n", kernel, param);
-            vtoy_len_ssprintf(buf, pos, len, "  echo \"Downloading initrd ...\"\n  initrd %s\n", initrd);
-            vtoy_len_ssprintf(buf, pos, len, "}\n");
-        
-            title[0] = kernel[0] = initrd[0] = param[0] = 0;
-        }
-    }
-
-    if (sub)
-    {
-        vtoy_len_ssprintf(buf, pos, len, "}\n");
-        sub = 0;
-    }
-
-    ventoy_memfile_env_set(args[1], buf, (ulonglong)pos);
-
-end:
-    grub_check_free(filebuf);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_unix.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_unix.c
@ -47,12 +47,6 @@ char *g_conf_new_data = NULL;
 int g_mod_new_len = 0;
 char *g_mod_new_data = NULL;

-int g_mod_search_magic = 0;
-int g_unix_vlnk_boot = 0;
-
-int g_ko_fillmap_len = 0;
-char *g_ko_fillmap_data = NULL;
-
 grub_uint64_t g_mod_override_offset = 0;
 grub_uint64_t g_conf_override_offset = 0;

@ -88,15 +82,6 @@ static grub_uint32_t ventoy_unix_get_override_chunk_count(void)
    {
        count++;
    }
-    
-    if (g_ko_fillmap_len > 0)
-    {
-        count += (g_ko_fillmap_len / 512);
-        if ((g_ko_fillmap_len % 512) > 0)
-        {
-            count++;
-        }
-    }

    return count;
 }
@ -136,50 +121,15 @@ static grub_uint32_t ventoy_unix_get_virt_chunk_size(void)
    return size;
 }

-static void ventoy_unix_fill_map_data(ventoy_chain_head *chain, struct g_ventoy_map *map)
+static void ventoy_unix_fill_override_data(    grub_uint64_t isosize, void *override)
 {
-    grub_uint32_t i;
-    ventoy_img_chunk *chunk = NULL;
-
-    debug("Fill unix map data: <%llu> <%u> %p\n", 
-        (unsigned long long)chain->os_param.vtoy_disk_size, g_img_chunk_list.cur_chunk, map);
-    
-    map->magic1[0] = map->magic2[0] = VENTOY_UNIX_SEG_MAGIC0;
-    map->magic1[1] = map->magic2[1] = VENTOY_UNIX_SEG_MAGIC1;
-    map->magic1[2] = map->magic2[2] = VENTOY_UNIX_SEG_MAGIC2;
-    map->magic1[3] = map->magic2[3] = VENTOY_UNIX_SEG_MAGIC3;
-
-    map->disksize = chain->os_param.vtoy_disk_size;
-    grub_memcpy(map->diskuuid, chain->os_param.vtoy_disk_guid, 16);
-
-    map->segnum = g_img_chunk_list.cur_chunk;
-    if (g_img_chunk_list.cur_chunk > VENTOY_UNIX_MAX_SEGNUM)
-    {
-        debug("####[FAIL] Too many segments for the ISO file %u\n", g_img_chunk_list.cur_chunk);
-        map->segnum = VENTOY_UNIX_MAX_SEGNUM;
-    }
-    
-    for (i = 0; i < (grub_uint32_t)(map->segnum); i++)
-    {
-        chunk = g_img_chunk_list.chunk + i;
-        map->seglist[i].seg_start_bytes = chunk->disk_start_sector * 512ULL;
-        map->seglist[i].seg_end_bytes = (chunk->disk_end_sector + 1) * 512ULL;        
-    }
-}
-
-static void ventoy_unix_fill_override_data(    grub_uint64_t isosize, ventoy_chain_head *chain)
-{
-    int i;
-    int left;
-    char *data = NULL;
-    grub_uint64_t offset;
    grub_uint64_t sector;
    ventoy_override_chunk *cur;
    ventoy_iso9660_override *dirent;
    
    sector = (isosize + 2047) / 2048;

-    cur = (ventoy_override_chunk *)((char *)chain + chain->override_chunk_offset);
+    cur = (ventoy_override_chunk *)override;

    if (g_conf_new_len > 0)
    {
@ -192,12 +142,12 @@ static void ventoy_unix_fill_override_data(    grub_uint64_t isosize, ventoy_cha
        dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
        dirent->size_be         = grub_swap_bytes32(dirent->size);
        sector += (dirent->size + 2047) / 2048;
-        cur++;
    }

    if (g_mod_new_len > 0)
    {
        /* mod.ko */
+        cur++;
        cur->img_offset = g_mod_override_offset;
        cur->override_size = sizeof(ventoy_iso9660_override);
        dirent = (ventoy_iso9660_override *)cur->override_data;
@ -206,37 +156,6 @@ static void ventoy_unix_fill_override_data(    grub_uint64_t isosize, ventoy_cha
        dirent->first_sector_be = grub_swap_bytes32(dirent->first_sector);
        dirent->size_be         = grub_swap_bytes32(dirent->size);
        sector += (dirent->size + 2047) / 2048;
-        cur++;
-    }
-
-    if (g_ko_fillmap_len > 0)
-    {
-        data = g_ko_fillmap_data;
-        offset = g_mod_override_offset;
-
-        ventoy_unix_fill_map_data(chain, (struct g_ventoy_map *)data);
-        
-        for (i = 0; i < g_ko_fillmap_len / 512; i++)
-        {
-            cur->img_offset = offset;
-            cur->override_size = 512;
-            grub_memcpy(cur->override_data, data, 512);
-
-            offset += 512;
-            data += 512;
-            cur++;
-        }
-
-        left = (g_ko_fillmap_len % 512);
-        if (left > 0)
-        {
-            cur->img_offset = offset;
-            cur->override_size = left;
-            grub_memcpy(cur->override_data, data, left);
-
-            offset += left;
-            cur++;
-        }
    }

    return;
@ -263,25 +182,19 @@ static void ventoy_unix_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_h

    if (g_mod_new_len > 0)
    {
-        if (g_mod_search_magic > 0)
-        {
-            ventoy_unix_fill_map_data(chain, (struct g_ventoy_map *)(g_mod_new_data + g_mod_search_magic));
-        }
-    
        ventoy_unix_fill_virt(g_mod_new_data, g_mod_new_len);
    }
    
    return;
 }

-static int ventoy_freebsd_append_conf(char *buf, const char *isopath, const char *alias)
+static int ventoy_freebsd_append_conf(char *buf, const char *isopath)
 {
    int pos = 0;
    grub_uint32_t i;
    grub_disk_t disk;
    grub_file_t isofile;
    char uuid[64] = {0};
-    const char *val = NULL;
    ventoy_img_chunk *chunk;
    grub_uint8_t disk_sig[4];
    grub_uint8_t disk_guid[16];
@ -296,31 +209,7 @@ static int ventoy_freebsd_append_conf(char *buf, const char *isopath, const char

    vtoy_ssprintf(buf, pos, "ventoy_load=\"%s\"\n", "YES");
    vtoy_ssprintf(buf, pos, "ventoy_name=\"%s\"\n", g_ko_mod_path);
-    
-    if (alias)
-    {
-        vtoy_ssprintf(buf, pos, "hint.ventoy.0.alias=\"%s\"\n", alias);
-    }

-    if (g_unix_vlnk_boot)
-    {
-        vtoy_ssprintf(buf, pos, "hint.ventoy.0.vlnk=%d\n", 1);
-    }
-
-    val = ventoy_get_env("VTOY_UNIX_REMOUNT");
-    if (val && val[0] == '1' && val[1] == 0)
-    {
-        vtoy_ssprintf(buf, pos, "hint.ventoy.0.remount=%d\n", 1);
-    }
-
-    if (g_mod_search_magic)
-    {
-        debug("hint.ventoy NO need\n");
-        goto out;
-    }
-
-    debug("Fill hint.ventoy info\n");
-    
    disk = isofile->device->disk;

    ventoy_get_disk_guid(isofile->name, disk_guid, disk_sig);
@ -343,8 +232,8 @@ static int ventoy_freebsd_append_conf(char *buf, const char *isopath, const char
            (ulonglong)((chunk->disk_end_sector + 1) * 512));
    }

-out:
    grub_file_close(isofile);
+
    return pos;
 }

@ -369,38 +258,13 @@ grub_err_t ventoy_cmd_unix_reset(grub_extcmd_context_t ctxt, int argc, char **ar
    (void)argc;
    (void)args;
    
-    g_unix_vlnk_boot = 0;
-    g_mod_search_magic = 0;
    g_conf_new_len = 0;
    g_mod_new_len = 0;
    g_mod_override_offset = 0;
    g_conf_override_offset = 0;
-    g_ko_fillmap_len = 0;

    check_free(g_mod_new_data, grub_free);
    check_free(g_conf_new_data, grub_free);
-    check_free(g_ko_fillmap_data, grub_free);
-
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
-grub_err_t ventoy_cmd_unix_check_vlnk(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    grub_file_t file;
-
-    (void)ctxt;
-
-    if (argc != 1)
-    {
-        return 1;
-    }
-
-    file = grub_file_open(args[0], VENTOY_FILE_TYPE);
-    if (file)
-    {
-        g_unix_vlnk_boot = file->vlnk;
-        grub_file_close(file);
-    }

    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }
@ -445,16 +309,12 @@ grub_err_t ventoy_cmd_parse_freenas_ver(grub_extcmd_context_t ctxt, int argc, ch
    ver = vtoy_json_get_string_ex(json->pstChild, "Version");
    if (ver)
    {
-        debug("NAS version:<%s>\n", ver);
-        if (grub_strncmp(ver, "TrueNAS-", 8) == 0)
-        {
-            ver += 8;
-        }
+        debug("freenas version:<%s>\n", ver);
        ventoy_set_env(args[1], ver);
    }
    else
    {
-        debug("NAS version:<%s>\n", "NOT FOUND");
+        debug("freenas version:<%s>\n", "NOT FOUND");
        grub_env_unset(args[1]);
    }

@ -693,109 +553,6 @@ out:
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-grub_err_t ventoy_cmd_unix_replace_grub_conf(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    int len = 0;
-    grub_uint32_t i;
-    char *data;
-    char *pos;
-    const char *val = NULL;
-    grub_uint64_t offset;
-    grub_file_t file;
-    char extcfg[512];
-    const char *confile = NULL;
-    const char * loader_conf[] = 
-    {
-        "/boot/grub/grub.cfg",
-    };
-
-    (void)ctxt;
-
-    if (argc != 1 && argc != 2)
-    {
-        debug("Replace conf invalid argc %d\n", argc);
-        return 1;
-    }
- 
-    for (i = 0; i < sizeof(loader_conf) / sizeof(loader_conf[0]); i++)
-    {
-        if (ventoy_get_file_override(loader_conf[i], &offset) == 0)
-        {
-            confile = loader_conf[i];
-            g_conf_override_offset = offset;
-            break;
-        }
-    }
-
-    if (confile == NULL)
-    {   
-        debug("Can't find grub.cfg file from %u locations\n", i);
-        return 1;
-    }
-
-    file = ventoy_grub_file_open(GRUB_FILE_TYPE_LINUX_INITRD, "(loop)/%s", confile);
-    if (!file)
-    {
-        debug("Failed to open %s \n", confile);
-        return 1;
-    }
-
-    debug("old grub2 conf file size:%d\n", (int)file->size);
-
-    data = grub_malloc(VTOY_MAX_SCRIPT_BUF);
-    if (!data)
-    {
-        grub_file_close(file);    
-        return 1;
-    }
-
-    grub_file_read(file, data, file->size);
-    grub_file_close(file);
-    
-    g_conf_new_data = data;
-    g_conf_new_len = (int)file->size;
-
-    pos = grub_strstr(data, "kfreebsd /boot/kernel/kernel");
-    if (pos)
-    {
-        pos += grub_strlen("kfreebsd /boot/kernel/kernel");
-        if (grub_strncmp(pos, ".gz", 3) == 0)
-        {
-            pos += 3;
-        }
-
-        if (argc == 2)
-        {
-            vtoy_ssprintf(extcfg, len, ";kfreebsd_module_elf %s; set kFreeBSD.hint.ventoy.0.alias=\"%s\"", args[0], args[1]);
-        }
-        else
-        {
-            vtoy_ssprintf(extcfg, len, ";kfreebsd_module_elf %s", args[0]);
-        }
-
-        if (g_unix_vlnk_boot)
-        {
-            vtoy_ssprintf(extcfg, len, ";set kFreeBSD.hint.ventoy.0.vlnk=%d", 1);
-        }
-
-        val = ventoy_get_env("VTOY_UNIX_REMOUNT");
-        if (val && val[0] == '1' && val[1] == 0)
-        {
-            vtoy_ssprintf(extcfg, len, ";set kFreeBSD.hint.ventoy.0.remount=%d", 1);
-        }
-        
-        grub_memmove(pos + len, pos, (int)(file->size - (pos - data)));
-        grub_memcpy(pos, extcfg, len);
-        g_conf_new_len += len;
-    }
-    else
-    {
-        debug("no kfreebsd found\n");
-    }
-    
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
 grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, char **args)
 {
    grub_uint32_t i;
@ -811,7 +568,7 @@ grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, ch

    (void)ctxt;

-    if (argc != 2 && argc != 3)
+    if (argc != 2)
    {
        debug("Replace conf invalid argc %d\n", argc);
        return 1;
@ -840,7 +597,7 @@ grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, ch
        return 1;
    }

-    debug("old conf file <%s> size:%d\n", confile, (int)file->size);
+    debug("old conf file size:%d\n", (int)file->size);

    data = grub_malloc(VTOY_MAX_SCRIPT_BUF);
    if (!data)
@ -857,7 +614,7 @@ grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, ch

    if (grub_strcmp(args[0], "FreeBSD") == 0)
    {
-        g_conf_new_len += ventoy_freebsd_append_conf(data + file->size, args[1], (argc > 2) ? args[2] : NULL);
+        g_conf_new_len += ventoy_freebsd_append_conf(data + file->size, args[1]);
    }
    else if (grub_strcmp(args[0], "DragonFly") == 0)
    {
@ -867,27 +624,6 @@ grub_err_t ventoy_cmd_unix_replace_conf(grub_extcmd_context_t ctxt, int argc, ch
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-static int ventoy_unix_search_magic(char *data, int len)
-{
-    int i;
-    grub_uint32_t *magic = NULL;    
-
-    for (i = 0; i < len; i += 4096)
-    {
-        magic = (grub_uint32_t *)(data + i);
-        if (magic[0] == VENTOY_UNIX_SEG_MAGIC0 && magic[1] == VENTOY_UNIX_SEG_MAGIC1 && 
-            magic[2] == VENTOY_UNIX_SEG_MAGIC2 && magic[3] == VENTOY_UNIX_SEG_MAGIC3)
-        {
-            debug("unix find search magic at 0x%x loop:%d\n", i, (i >> 12));
-            g_mod_search_magic = i;
-            return 0;
-        }
-    }
-
-    debug("unix can not find search magic\n");
-    return 1;
-}
-
 grub_err_t ventoy_cmd_unix_replace_ko(grub_extcmd_context_t ctxt, int argc, char **args)
 {
    char *data;
@ -937,73 +673,10 @@ grub_err_t ventoy_cmd_unix_replace_ko(grub_extcmd_context_t ctxt, int argc, char
    
    g_mod_new_data = data;
    g_mod_new_len = (int)file->size;
-
-    ventoy_unix_search_magic(g_mod_new_data, g_mod_new_len);
    
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

-grub_err_t ventoy_cmd_unix_ko_fillmap(grub_extcmd_context_t ctxt, int argc, char **args)
-{
-    int i;
-    grub_file_t file;
-    grub_uint32_t magic[4];
-    grub_uint32_t len;
-
-    (void)ctxt;
-
-    if (argc != 1)
-    {
-        debug("Fillmap ko invalid argc %d\n", argc);
-        return 1;
-    }
-
-    debug("Fillmap ko %s\n", args[0]);
-
-    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(loop)%s", args[0]);
-    if (file)
-    {
-        grub_file_read(file, magic, 4); /* read for trigger */
-        g_mod_override_offset = grub_iso9660_get_last_read_pos(file);
-    }
-    else
-    {   
-        debug("Can't find replace ko file from %s\n", args[0]);
-        return 1;
-    }
-
-    for (i = 0; i < (int)(file->size); i += 65536)
-    {
-        magic[0] = 0;
-        grub_file_seek(file, i);
-        grub_file_read(file, magic, sizeof(magic));
-    
-        if (magic[0] == VENTOY_UNIX_SEG_MAGIC0 && magic[1] == VENTOY_UNIX_SEG_MAGIC1 && 
-            magic[2] == VENTOY_UNIX_SEG_MAGIC2 && magic[3] == VENTOY_UNIX_SEG_MAGIC3)
-        {
-            debug("unix find search magic at 0x%x loop:%d\n", i, (i >> 16));
-            g_mod_override_offset += i;
-            break;
-        }
-    }
-
-    len = (grub_uint32_t)OFFSET_OF(struct g_ventoy_map, seglist) + 
-        (sizeof(struct g_ventoy_seg) * g_img_chunk_list.cur_chunk);
-
-    g_ko_fillmap_len = (int)len;
-    g_ko_fillmap_data = grub_malloc(len);
-    if (!g_ko_fillmap_data)
-    {
-        g_ko_fillmap_len = 0;
-        debug("Failed to malloc fillmap data\n");
-    }
-
-    debug("Fillmap ko segnum:%u, override len:%u data:%p\n", g_img_chunk_list.cur_chunk, len, g_ko_fillmap_data);
-
-    grub_file_close(file);
-    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
-}
-
 grub_err_t ventoy_cmd_unix_fill_image_desc(grub_extcmd_context_t ctxt, int argc, char **args)
 {
    int i;
@ -1118,6 +791,7 @@ grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char
    const char *pLastChain = NULL;
    const char *compatible;
    ventoy_chain_head *chain;
+    char envbuf[64];
    
    (void)ctxt;
    (void)argc;
@ -1188,15 +862,18 @@ grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char
        }
    }

-    chain = ventoy_alloc_chain(size);
+    chain = grub_malloc(size);
    if (!chain)
    {
-        grub_printf("Failed to alloc chain unix memory size %u\n", size);
+        grub_printf("Failed to alloc chain memory size %u\n", size);
        grub_file_close(file);
        return 1;
    }

-    ventoy_memfile_env_set("vtoy_chain_mem", chain, (ulonglong)size);
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (unsigned long)chain);
+    grub_env_set("vtoy_chain_mem_addr", envbuf);
+    grub_snprintf(envbuf, sizeof(envbuf), "%u", size);
+    grub_env_set("vtoy_chain_mem_size", envbuf);

    grub_memset(chain, 0, sizeof(ventoy_chain_head));

@ -1231,7 +908,7 @@ grub_err_t ventoy_cmd_unix_chain_data(grub_extcmd_context_t ctxt, int argc, char
    /* part 4: override chunk */
    chain->override_chunk_offset = chain->img_chunk_offset + img_chunk_size;
    chain->override_chunk_num = override_count;
-    ventoy_unix_fill_override_data(isosize, chain);
+    ventoy_unix_fill_override_data(isosize, (char *)chain + chain->override_chunk_offset);

    /* part 5: virt chunk */
    chain->virt_chunk_offset = chain->override_chunk_offset + override_size;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_vhd.c
@ -148,10 +148,9 @@ static int ventoy_vhd_patch_path(char *vhdpath, ventoy_patch_vhd *patch1, ventoy
    return 0;
 }

-static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index, grub_uint64_t *poffset)
+static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, int *index)
 {
    int i;
-    int find = 0;
    int ret = 1;
    grub_uint64_t start;
    grub_file_t file = NULL;
@ -184,7 +183,6 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
                if (start == gpt->PartTbl[i].StartLBA)
                {
                    *index = i;
-                    find = 1;
                    break;
                }
            }
@ -198,22 +196,11 @@ static int ventoy_vhd_read_parttbl(const char *filename, ventoy_gpt_info *gpt, i
            if ((grub_uint32_t)start == gpt->MBR.PartTbl[i].StartSectorId)
            {
                *index = i;
-                find = 1;
                break;
            }
        }
    }    

-    if (find == 0) // MBR Logical partition
-    {
-        if (file->device->disk->partition->number > 0)
-        {
-            *index = file->device->disk->partition->number;
-            debug("Fall back part number: %d\n", *index);
-        }
-    }
-
-    *poffset = start;
    ret = 0;

 end:
@ -239,7 +226,7 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
    else
    {
        gpt = grub_zalloc(sizeof(ventoy_gpt_info));
-        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex, &offset);
+        ventoy_vhd_read_parttbl(vhdpath, gpt, &partIndex);
        debug("This is HDD partIndex %d %s\n", partIndex, vhdpath);
    }

@ -262,11 +249,9 @@ static int ventoy_vhd_patch_disk(const char *vhdpath, ventoy_patch_vhd *patch1,
    }
    else
    {
-        if (offset == 0)
-        {
-            offset = gpt->MBR.PartTbl[partIndex].StartSectorId;
-        }
+        offset = gpt->MBR.PartTbl[partIndex].StartSectorId;
        offset *= 512;
+    
        debug("MBR disk signature: %02x%02x%02x%02x Part(%d) offset:%llu\n",
            gpt->MBR.BootCode[0x1b8 + 0], gpt->MBR.BootCode[0x1b8 + 1],
            gpt->MBR.BootCode[0x1b8 + 2], gpt->MBR.BootCode[0x1b8 + 3],
@ -320,6 +305,7 @@ grub_err_t ventoy_cmd_patch_vhdboot(grub_extcmd_context_t ctxt, int argc, char *
    int patchoffset[2];
    ventoy_patch_vhd *patch1;
    ventoy_patch_vhd *patch2;
+    char envbuf[64];

    (void)ctxt;
    (void)argc;
@ -370,9 +356,15 @@ grub_err_t ventoy_cmd_patch_vhdboot(grub_extcmd_context_t ctxt, int argc, char *

    /* set buffer and size */
 #ifdef GRUB_MACHINE_EFI
-    ventoy_memfile_env_set("vtoy_vhd_buf", g_vhdboot_totbuf, (ulonglong)(g_vhdboot_isolen + sizeof(ventoy_chain_head)));
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (ulong)g_vhdboot_totbuf);
+    grub_env_set("vtoy_vhd_buf_addr", envbuf);
+    grub_snprintf(envbuf, sizeof(envbuf), "%d", (int)(g_vhdboot_isolen + sizeof(ventoy_chain_head)));
+    grub_env_set("vtoy_vhd_buf_size", envbuf);
 #else
-    ventoy_memfile_env_set("vtoy_vhd_buf", g_vhdboot_isobuf, (ulonglong)g_vhdboot_isolen);
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (ulong)g_vhdboot_isobuf);
+    grub_env_set("vtoy_vhd_buf_addr", envbuf);
+    grub_snprintf(envbuf, sizeof(envbuf), "%d", g_vhdboot_isolen);
+    grub_env_set("vtoy_vhd_buf_size", envbuf);
 #endif

    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
@ -504,7 +496,7 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
    vhd_footer_t vhdfoot;
    VDIPREHEADER vdihdr;
    char type[16] = {0};
-    ventoy_gpt_info *gpt = NULL;
+    ventoy_gpt_info *gpt;
    
    (void)ctxt;

@ -536,25 +528,12 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
    {
        grub_file_seek(file, 0);
        grub_file_read(file, &vdihdr, sizeof(vdihdr));
-        if (vdihdr.u32Signature == VDI_IMAGE_SIGNATURE)            
+        if (vdihdr.u32Signature == VDI_IMAGE_SIGNATURE &&
+            grub_strncmp(vdihdr.szFileInfo, VDI_IMAGE_FILE_INFO, grub_strlen(VDI_IMAGE_FILE_INFO)) == 0)
        {
+            offset = 2 * 1048576;
+            g_img_trim_head_secnum = offset / 512;
            grub_snprintf(type, sizeof(type), "vdi");
-            if (grub_strncmp(vdihdr.szFileInfo, VDI_IMAGE_FILE_INFO, grub_strlen(VDI_IMAGE_FILE_INFO)) == 0)
-            {
-                offset = 2 * 1048576;
-                g_img_trim_head_secnum = offset / 512;
-                debug("VDI V1\n");
-            }
-            else if (grub_strncmp(vdihdr.szFileInfo, VDI_IMAGE_FILE_INFO2, grub_strlen(VDI_IMAGE_FILE_INFO2)) == 0)
-            {
-                offset = 2 * 1048576;
-                g_img_trim_head_secnum = offset / 512;
-                debug("VDI V2\n");
-            }
-            else
-            {
-                debug("invalid file info <%s>\n", vdihdr.szFileInfo);
-            }
        }
        else
        {
@ -581,7 +560,7 @@ grub_err_t ventoy_cmd_get_vtoy_type(grub_extcmd_context_t ctxt, int argc, char *
        if (gpt->MBR.Byte55 != 0x55 || gpt->MBR.ByteAA != 0xAA)
        {
            grub_env_set(args[1], "unknown");
-            debug("invalid mbr signature: 0x%x 0x%x offset=%d\n", gpt->MBR.Byte55, gpt->MBR.ByteAA, offset);
+            debug("invalid mbr signature: 0x%x 0x%x\n", gpt->MBR.Byte55, gpt->MBR.ByteAA);
            goto end;
        }

@ -666,6 +645,7 @@ grub_err_t ventoy_cmd_raw_chain_data(grub_extcmd_context_t ctxt, int argc, char
    grub_disk_t disk;
    const char *pLastChain = NULL;
    ventoy_chain_head *chain;
+    char envbuf[64];
    
    (void)ctxt;
    (void)argc;
@ -687,11 +667,6 @@ grub_err_t ventoy_cmd_raw_chain_data(grub_extcmd_context_t ctxt, int argc, char
        return 1;
    }

-    if (grub_strncmp(args[0], g_iso_path, grub_strlen(g_iso_path)))
-    {
-        file->vlnk = 1;
-    }
-
    img_chunk_size = g_img_chunk_list.cur_chunk * sizeof(ventoy_img_chunk);
    
    size = sizeof(ventoy_chain_head) + img_chunk_size;
@ -707,15 +682,18 @@ grub_err_t ventoy_cmd_raw_chain_data(grub_extcmd_context_t ctxt, int argc, char
        }
    }

-    chain = ventoy_alloc_chain(size);
+    chain = grub_malloc(size);
    if (!chain)
    {
-        grub_printf("Failed to alloc chain raw memory size %u\n", size);
+        grub_printf("Failed to alloc chain memory size %u\n", size);
        grub_file_close(file);
        return 1;
    }

-    ventoy_memfile_env_set("vtoy_chain_mem", chain, (ulonglong)size);
+    grub_snprintf(envbuf, sizeof(envbuf), "0x%lx", (unsigned long)chain);
+    grub_env_set("vtoy_chain_mem_addr", envbuf);
+    grub_snprintf(envbuf, sizeof(envbuf), "%u", size);
+    grub_env_set("vtoy_chain_mem_size", envbuf);

    grub_env_export("vtoy_chain_mem_addr");
    grub_env_export("vtoy_chain_mem_size");
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_windows.c
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/charset.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/charset.h
@ -1,329 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_CHARSET_HEADER
-#define GRUB_CHARSET_HEADER	1
-
-#include <grub/types.h>
-
-#define GRUB_UINT8_1_LEADINGBIT 0x80
-#define GRUB_UINT8_2_LEADINGBITS 0xc0
-#define GRUB_UINT8_3_LEADINGBITS 0xe0
-#define GRUB_UINT8_4_LEADINGBITS 0xf0
-#define GRUB_UINT8_5_LEADINGBITS 0xf8
-#define GRUB_UINT8_6_LEADINGBITS 0xfc
-#define GRUB_UINT8_7_LEADINGBITS 0xfe
-
-#define GRUB_UINT8_1_TRAILINGBIT 0x01
-#define GRUB_UINT8_2_TRAILINGBITS 0x03
-#define GRUB_UINT8_3_TRAILINGBITS 0x07
-#define GRUB_UINT8_4_TRAILINGBITS 0x0f
-#define GRUB_UINT8_5_TRAILINGBITS 0x1f
-#define GRUB_UINT8_6_TRAILINGBITS 0x3f
-
-#define GRUB_MAX_UTF8_PER_UTF16 4
-/* You need at least one UTF-8 byte to have one UTF-16 word.
-   You need at least three UTF-8 bytes to have 2 UTF-16 words (surrogate pairs).
- */
-#define GRUB_MAX_UTF16_PER_UTF8 1
-#define GRUB_MAX_UTF8_PER_CODEPOINT 4
-
-#define GRUB_UCS2_LIMIT 0x10000
-#define GRUB_UTF16_UPPER_SURROGATE(code) \
-  (0xD800 | ((((code) - GRUB_UCS2_LIMIT) >> 10) & 0x3ff))
-#define GRUB_UTF16_LOWER_SURROGATE(code) \
-  (0xDC00 | (((code) - GRUB_UCS2_LIMIT) & 0x3ff))
-
-/* Process one character from UTF8 sequence. 
-   At beginning set *code = 0, *count = 0. Returns 0 on failure and
-   1 on success. *count holds the number of trailing bytes.  */
-static inline int
-grub_utf8_process (grub_uint8_t c, grub_uint32_t *code, int *count)
-{
-  if (*count)
-    {
-      if ((c & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT)
-	{
-	  *count = 0;
-	  /* invalid */
-	  return 0;
-	}
-      else
-	{
-	  *code <<= 6;
-	  *code |= (c & GRUB_UINT8_6_TRAILINGBITS);
-	  (*count)--;
-	  /* Overlong.  */
-	  if ((*count == 1 && *code <= 0x1f)
-	      || (*count == 2 && *code <= 0xf))
-	    {
-	      *code = 0;
-	      *count = 0;
-	      return 0;
-	    }
-	  return 1;
-	}
-    }
-
-  if ((c & GRUB_UINT8_1_LEADINGBIT) == 0)
-    {
-      *code = c;
-      return 1;
-    }
-  if ((c & GRUB_UINT8_3_LEADINGBITS) == GRUB_UINT8_2_LEADINGBITS)
-    {
-      *count = 1;
-      *code = c & GRUB_UINT8_5_TRAILINGBITS;
-      /* Overlong */
-      if (*code <= 1)
-	{
-	  *count = 0;
-	  *code = 0;
-	  return 0;
-	}
-      return 1;
-    }
-  if ((c & GRUB_UINT8_4_LEADINGBITS) == GRUB_UINT8_3_LEADINGBITS)
-    {
-      *count = 2;
-      *code = c & GRUB_UINT8_4_TRAILINGBITS;
-      return 1;
-    }
-  if ((c & GRUB_UINT8_5_LEADINGBITS) == GRUB_UINT8_4_LEADINGBITS)
-    {
-      *count = 3;
-      *code = c & GRUB_UINT8_3_TRAILINGBITS;
-      return 1;
-    }
-  return 0;
-}
-
-
-/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
-   bytes (if SRCSIZE is -1, it is ignored) in length to a UTF-16 string.
-   Return the number of characters converted. DEST must be able to hold
-   at least DESTSIZE characters. If an invalid sequence is found, return -1.
-   If SRCEND is not NULL, then *SRCEND is set to the next byte after the
-   last byte used in SRC.  */
-static inline grub_size_t
-grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
-		    const grub_uint8_t *src, grub_size_t srcsize,
-		    const grub_uint8_t **srcend)
-{
-  grub_uint16_t *p = dest;
-  int count = 0;
-  grub_uint32_t code = 0;
-
-  if (srcend)
-    *srcend = src;
-
-  while (srcsize && destsize)
-    {
-      int was_count = count;
-      if (srcsize != (grub_size_t)-1)
-	srcsize--;
-      if (!grub_utf8_process (*src++, &code, &count))
-	{
-	  code = '?';
-	  count = 0;
-	  /* Character c may be valid, don't eat it.  */
-	  if (was_count)
-	    src--;
-	}
-      if (count != 0)
-	continue;
-      if (code == 0)
-	break;
-      if (destsize < 2 && code >= GRUB_UCS2_LIMIT)
-	break;
-      if (code >= GRUB_UCS2_LIMIT)
-	{
-	  *p++ = GRUB_UTF16_UPPER_SURROGATE (code);
-	  *p++ = GRUB_UTF16_LOWER_SURROGATE (code);
-	  destsize -= 2;
-	}
-      else
-	{
-	  *p++ = code;
-	  destsize--;
-	}
-    }
-
-  if (srcend)
-    *srcend = src;
-  return p - dest;
-}
-
-/* Determine the last position where the UTF-8 string [beg, end) can
-   be safely cut. */
-static inline grub_size_t
-grub_getend (const char *beg, const char *end)
-{
-  const char *ptr;
-  for (ptr = end - 1; ptr >= beg; ptr--)
-    if ((*ptr & GRUB_UINT8_2_LEADINGBITS) != GRUB_UINT8_1_LEADINGBIT)
-      break;
-  if (ptr < beg)
-    return 0;
-  if ((*ptr & GRUB_UINT8_1_LEADINGBIT) == 0)
-    return ptr + 1 - beg;
-  if ((*ptr & GRUB_UINT8_3_LEADINGBITS) == GRUB_UINT8_2_LEADINGBITS
-      && ptr + 2 <= end)
-    return ptr + 2 - beg;
-  if ((*ptr & GRUB_UINT8_4_LEADINGBITS) == GRUB_UINT8_3_LEADINGBITS
-      && ptr + 3 <= end)
-    return ptr + 3 - beg;
-  if ((*ptr & GRUB_UINT8_5_LEADINGBITS) == GRUB_UINT8_4_LEADINGBITS
-      && ptr + 4 <= end)
-    return ptr + 4 - beg;
-  /* Invalid character or incomplete. Cut before it.  */
-  return ptr - beg;
-}
-
-/* Convert UTF-16 to UTF-8.  */
-static inline grub_uint8_t *
-grub_utf16_to_utf8 (grub_uint8_t *dest, const grub_uint16_t *src,
-		    grub_size_t size)
-{
-  grub_uint32_t code_high = 0;
-
-  while (size--)
-    {
-      grub_uint32_t code = *src++;
-
-      if (code_high)
-	{
-	  if (code >= 0xDC00 && code <= 0xDFFF)
-	    {
-	      /* Surrogate pair.  */
-	      code = ((code_high - 0xD800) << 10) + (code - 0xDC00) + 0x10000;
-
-	      *dest++ = (code >> 18) | 0xF0;
-	      *dest++ = ((code >> 12) & 0x3F) | 0x80;
-	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
-	      *dest++ = (code & 0x3F) | 0x80;
-	    }
-	  else
-	    {
-	      /* Error...  */
-	      *dest++ = '?';
-	      /* *src may be valid. Don't eat it.  */
-	      src--;
-	    }
-
-	  code_high = 0;
-	}
-      else
-	{
-	  if (code <= 0x007F)
-	    *dest++ = code;
-	  else if (code <= 0x07FF)
-	    {
-	      *dest++ = (code >> 6) | 0xC0;
-	      *dest++ = (code & 0x3F) | 0x80;
-	    }
-	  else if (code >= 0xD800 && code <= 0xDBFF)
-	    {
-	      code_high = code;
-	      continue;
-	    }
-	  else if (code >= 0xDC00 && code <= 0xDFFF)
-	    {
-	      /* Error... */
-	      *dest++ = '?';
-	    }
-	  else if (code < 0x10000)
-	    {
-	      *dest++ = (code >> 12) | 0xE0;
-	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
-	      *dest++ = (code & 0x3F) | 0x80;
-	    }
-	  else
-	    {
-	      *dest++ = (code >> 18) | 0xF0;
-	      *dest++ = ((code >> 12) & 0x3F) | 0x80;
-	      *dest++ = ((code >> 6) & 0x3F) | 0x80;
-	      *dest++ = (code & 0x3F) | 0x80;
-	    }
-	}
-    }
-
-  return dest;
-}
-
-#define GRUB_MAX_UTF8_PER_LATIN1 2
-
-/* Convert Latin1 to UTF-8.  */
-static inline grub_uint8_t *
-grub_latin1_to_utf8 (grub_uint8_t *dest, const grub_uint8_t *src,
-		     grub_size_t size)
-{
-  while (size--)
-    {
-      if (!(*src & 0x80))
-	*dest++ = *src;
-      else
-	{
-	  *dest++ = (*src >> 6) | 0xC0;
-	  *dest++ = (*src & 0x3F) | 0x80;
-	}
-      src++;
-    }
-
-  return dest;
-}
-
-/* Convert UCS-4 to UTF-8.  */
-char *grub_ucs4_to_utf8_alloc (const grub_uint32_t *src, grub_size_t size);
-
-int
-grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
-
-grub_ssize_t grub_utf8_to_ucs4_alloc (const char *msg,
-				      grub_uint32_t **unicode_msg,
-				      grub_uint32_t **last_position);
-
-/* Returns the number of bytes the string src would occupy is converted
-   to UTF-8, excluding \0.  */
-grub_size_t
-grub_get_num_of_utf8_bytes (const grub_uint32_t *src, grub_size_t size);
-
-/* Converts UCS-4 to UTF-8. Returns the number of bytes effectively written
-   excluding the trailing \0.  */
-grub_size_t
-grub_ucs4_to_utf8 (const grub_uint32_t *src, grub_size_t size,
-		   grub_uint8_t *dest, grub_size_t destsize);
-grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
-			       const grub_uint8_t *src, grub_size_t srcsize,
-			       const grub_uint8_t **srcend);
-/* Returns -2 if not enough space, -1 on invalid character.  */
-grub_ssize_t
-grub_encode_utf8_character (grub_uint8_t *dest, grub_uint8_t *destend,
-			    grub_uint32_t code);
-
-const grub_uint32_t *
-grub_unicode_get_comb_start (const grub_uint32_t *str, 
-			     const grub_uint32_t *cur);
-
-int
-grub_utf8_get_num_code (const char *src, grub_size_t srcsize);
-
-const char *
-grub_utf8_offset_code (const char *src, grub_size_t srcsize, int num);
-
-#endif
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/api.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/api.h
@ -314,11 +314,6 @@
    { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
  }

-#define GRUB_EFI_SMBIOS3_TABLE_GUID	\
-  { 0xf2fd1544, 0x9794, 0x4a2c, \
-    { 0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94 } \
-  }
-
 #define GRUB_EFI_SAL_TABLE_GUID \
  { 0xeb9d2d32, 0x2d88, 0x11d3, \
      { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/efi.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/efi/efi.h
@ -88,7 +88,7 @@ EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,

 void * EXPORT_FUNC (grub_efi_allocate_iso_buf) (grub_uint64_t size);
 void * EXPORT_FUNC (grub_efi_allocate_chain_buf) (grub_uint64_t size);
-void EXPORT_FUNC (grub_efi_get_reserved_page_num) (grub_uint64_t *total, grub_uint64_t *org_required, grub_uint64_t *new_required);
+

 extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, 
 						char **device,
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/env.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/env.h
@ -1,73 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2006,2007,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_ENV_HEADER
-#define GRUB_ENV_HEADER	1
-
-#include <grub/symbol.h>
-#include <grub/err.h>
-#include <grub/types.h>
-#include <grub/menu.h>
-
-struct grub_env_var;
-
-typedef const char *(*grub_env_read_hook_t) (struct grub_env_var *var,
-					     const char *val);
-typedef char *(*grub_env_write_hook_t) (struct grub_env_var *var,
-					const char *val);
-
-struct grub_env_var
-{
-  char *name;
-  char *value;
-  grub_env_read_hook_t read_hook;
-  grub_env_write_hook_t write_hook;
-  struct grub_env_var *next;
-  struct grub_env_var **prevp;
-  struct grub_env_var *sorted_next;
-  int global;
-};
-
-grub_err_t EXPORT_FUNC(grub_env_set) (const char *name, const char *val);
-const char *EXPORT_FUNC(grub_env_get) (const char *name);
-void EXPORT_FUNC(grub_env_unset) (const char *name);
-struct grub_env_var *EXPORT_FUNC(grub_env_update_get_sorted) (void);
-
-#define FOR_SORTED_ENV(var) for (var = grub_env_update_get_sorted (); var; var = var->sorted_next)
-
-grub_err_t EXPORT_FUNC(grub_register_variable_hook) (const char *name,
-						     grub_env_read_hook_t read_hook,
-						     grub_env_write_hook_t write_hook);
-grub_err_t EXPORT_FUNC(grub_register_vtoy_menu_lang_hook) (grub_env_read_hook_t read_hook);
-
-grub_err_t grub_env_context_open (void);
-grub_err_t grub_env_context_close (void);
-grub_err_t EXPORT_FUNC(grub_env_export) (const char *name);
-
-void grub_env_unset_menu (void);
-grub_menu_t grub_env_get_menu (void);
-void grub_env_set_menu (grub_menu_t nmenu);
-
-grub_err_t
-grub_env_extractor_open (int source);
-
-grub_err_t
-grub_env_extractor_close (int source);
-
-
-#endif /* ! GRUB_ENV_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/file.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/file.h
@ -132,8 +132,7 @@ enum grub_file_type

    /* --skip-sig is specified.  */
    GRUB_FILE_TYPE_SKIP_SIGNATURE = 0x10000,
-    GRUB_FILE_TYPE_NO_DECOMPRESS = 0x20000,
-    GRUB_FILE_TYPE_NO_VLNK = 0x40000,
+    GRUB_FILE_TYPE_NO_DECOMPRESS = 0x20000
  };

 /* File description.  */
@ -142,8 +141,6 @@ struct grub_file
  /* File name.  */
  char *name;

-  int vlnk;
-
  /* The underlying device.  */
  grub_device_t device;

@ -216,11 +213,6 @@ grub_ssize_t EXPORT_FUNC(grub_file_read) (grub_file_t file, void *buf,
 grub_off_t EXPORT_FUNC(grub_file_seek) (grub_file_t file, grub_off_t offset);
 grub_err_t EXPORT_FUNC(grub_file_close) (grub_file_t file);

-int EXPORT_FUNC(grub_file_is_vlnk_suffix)(const char *name, int len);
-int EXPORT_FUNC(grub_file_add_vlnk)(const char *src, const char *dst);
-int EXPORT_FUNC(grub_file_vtoy_vlnk)(const char *src, const char *dst);
-const char * EXPORT_FUNC(grub_file_get_vlnk)(const char *name, int *vlnk);
-
 /* Return value of grub_file_size() in case file size is unknown. */
 #define GRUB_FILE_SIZE_UNKNOWN	 0xffffffffffffffffULL

--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/fs.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/fs.h
@ -128,6 +128,5 @@ grub_fs_unregister (grub_fs_t fs)
 #define FOR_FILESYSTEMS(var) FOR_LIST_ELEMENTS((var), (grub_fs_list))

 grub_fs_t EXPORT_FUNC(grub_fs_probe) (grub_device_t device);
-grub_fs_t EXPORT_FUNC(grub_fs_list_probe) (grub_device_t device, const char **list);

 #endif /* ! GRUB_FS_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/gfxmenu_view.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/gfxmenu_view.h
@ -1,128 +0,0 @@
-/* gfxmenu_view.h - gfxmenu view interface. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_GFXMENU_VIEW_HEADER
-#define GRUB_GFXMENU_VIEW_HEADER 1
-
-#include <grub/types.h>
-#include <grub/err.h>
-#include <grub/menu.h>
-#include <grub/font.h>
-#include <grub/gfxwidgets.h>
-
-struct grub_gfxmenu_view;   /* Forward declaration of opaque type.  */
-typedef struct grub_gfxmenu_view *grub_gfxmenu_view_t;
-
-
-grub_gfxmenu_view_t grub_gfxmenu_view_new (const char *theme_path,
-					   int width, int height);
-
-void grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view);
-
-/* Set properties on the view based on settings from the specified
-   theme file.  */
-grub_err_t grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view,
-                                         const char *theme_path);
-
-grub_err_t grub_gui_recreate_box (grub_gfxmenu_box_t *boxptr,
-                                  const char *pattern, const char *theme_dir);
-
-void grub_gfxmenu_view_draw (grub_gfxmenu_view_t view);
-
-void
-grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view);
-
-void
-grub_gfxmenu_redraw_timeout (grub_gfxmenu_view_t view);
-
-void
-grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
-			  const grub_video_rect_t *region);
-
-void 
-grub_gfxmenu_clear_timeout (void *data);
-void 
-grub_gfxmenu_print_timeout (int timeout, void *data);
-void
-grub_gfxmenu_set_chosen_entry (int entry, void *data);
-void
-grub_gfxmenu_scroll_chosen_entry (void *data, int diren);
-
-grub_err_t grub_font_draw_string (const char *str,
-				  grub_font_t font,
-				  grub_video_color_t color,
-				  int left_x, int baseline_y);
-int grub_font_get_string_width (grub_font_t font,
-				const char *str);
-
-
-/* Implementation details -- this should not be used outside of the
-   view itself.  */
-
-#include <grub/video.h>
-#include <grub/bitmap.h>
-#include <grub/bitmap_scale.h>
-#include <grub/gui.h>
-#include <grub/gfxwidgets.h>
-#include <grub/icon_manager.h>
-
-/* Definition of the private representation of the view.  */
-struct grub_gfxmenu_view
-{
-  grub_video_rect_t screen;
-
-  int need_to_check_sanity;
-  grub_video_rect_t terminal_rect;
-  int terminal_border;
-
-  grub_font_t title_font;
-  grub_font_t message_font;
-  char *terminal_font_name;
-  grub_video_rgba_color_t title_color;
-  grub_video_rgba_color_t message_color;
-  grub_video_rgba_color_t message_bg_color;
-  struct grub_video_bitmap *raw_desktop_image;
-  struct grub_video_bitmap *scaled_desktop_image;
-  grub_video_bitmap_selection_method_t desktop_image_scale_method;
-  grub_video_bitmap_h_align_t desktop_image_h_align;
-  grub_video_bitmap_v_align_t desktop_image_v_align;
-  grub_video_rgba_color_t desktop_color;
-  grub_gfxmenu_box_t terminal_box;
-  char *title_text;
-  char *progress_message_text;
-  char *theme_path;
-
-  grub_gui_container_t canvas;
-
-  int double_repaint;
-
-  int selected;
-
-  grub_video_rect_t progress_message_frame;
-
-  grub_menu_t menu;
-
-  int nested;
-
-  int first_timeout;
-
-  int *menu_title_offset;
-};
-
-#endif /* ! GRUB_GFXMENU_VIEW_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/menu_viewer.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/menu_viewer.h
@ -1,49 +0,0 @@
-/* menu_viewer.h - Interface to menu viewer implementations. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_MENU_VIEWER_HEADER
-#define GRUB_MENU_VIEWER_HEADER 1
-
-#include <grub/err.h>
-#include <grub/symbol.h>
-#include <grub/types.h>
-#include <grub/menu.h>
-#include <grub/term.h>
-
-struct grub_menu_viewer
-{
-  struct grub_menu_viewer *next;
-  void *data;
-  void (*set_chosen_entry) (int entry, void *data);
-  void (*scroll_chosen_entry) (void *data, int diren);
-  void (*print_timeout) (int timeout, void *data);
-  void (*clear_timeout) (void *data);
-  void (*fini) (void *fini);
-};
-
-void grub_menu_register_viewer (struct grub_menu_viewer *viewer);
-
-grub_err_t
-grub_menu_try_text (struct grub_term_output *term, 
-		    int entry, grub_menu_t menu, int nested);
-
-extern grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
-					    int nested);
-
-#endif /* GRUB_MENU_VIEWER_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/partition.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/partition.h
@ -1,141 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2004,2006,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_PART_HEADER
-#define GRUB_PART_HEADER	1
-
-#include <grub/dl.h>
-#include <grub/list.h>
-
-struct grub_disk;
-
-typedef struct grub_partition *grub_partition_t;
-
-#ifdef GRUB_UTIL
-typedef enum
-{
-  GRUB_EMBED_PCBIOS
-} grub_embed_type_t;
-#endif
-
-typedef int (*grub_partition_iterate_hook_t) (struct grub_disk *disk,
-					      const grub_partition_t partition,
-					      void *data);
-
-/* Partition map type.  */
-struct grub_partition_map
-{
-  /* The next partition map type.  */
-  struct grub_partition_map *next;
-  struct grub_partition_map **prev;
-
-  /* The name of the partition map type.  */
-  const char *name;
-
-  /* Call HOOK with each partition, until HOOK returns non-zero.  */
-  grub_err_t (*iterate) (struct grub_disk *disk,
-			 grub_partition_iterate_hook_t hook, void *hook_data);
-#ifdef GRUB_UTIL
-  /* Determine sectors available for embedding.  */
-  grub_err_t (*embed) (struct grub_disk *disk, unsigned int *nsectors,
-		       unsigned int max_nsectors,
-		       grub_embed_type_t embed_type,
-		       grub_disk_addr_t **sectors);
-#endif
-};
-typedef struct grub_partition_map *grub_partition_map_t;
-
-/* Partition description.  */
-struct grub_partition
-{
-  /* The partition number.  */
-  int number;
-
-  /* The start sector (relative to parent).  */
-  grub_disk_addr_t start;
-
-  /* The length in sector units.  */
-  grub_uint64_t len;
-
-  /* The offset of the partition table.  */
-  grub_disk_addr_t offset;
-
-  /* The index of this partition in the partition table.  */
-  int index;
-
-  /* Parent partition (physically contains this partition).  */
-  struct grub_partition *parent;
-
-  /* The type partition map.  */
-  grub_partition_map_t partmap;
-
-  /* The type of partition whne it's on MSDOS.
-     Used for embedding detection.  */
-  grub_uint8_t msdostype;
-
-  /* The attrib field for GPT. Needed for priority detection. */
-  grub_uint64_t gpt_attrib;
-};
-
-grub_partition_t EXPORT_FUNC(grub_partition_probe) (struct grub_disk *disk,
-						    const char *str);
-int EXPORT_FUNC(grub_partition_iterate) (struct grub_disk *disk,
-					 grub_partition_iterate_hook_t hook,
-					 void *hook_data);
-char *EXPORT_FUNC(grub_partition_get_name) (const grub_partition_t partition);
-
-
-extern grub_partition_map_t EXPORT_VAR(grub_partition_map_list);
-
-#ifndef GRUB_LST_GENERATOR
-static inline void
-grub_partition_map_register (grub_partition_map_t partmap)
-{
-  grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
-		  GRUB_AS_LIST (partmap));
-}
-#endif
-
-static inline void
-grub_partition_map_unregister (grub_partition_map_t partmap)
-{
-  grub_list_remove (GRUB_AS_LIST (partmap));
-}
-
-#define FOR_PARTITION_MAPS(var) FOR_LIST_ELEMENTS((var), (grub_partition_map_list))
-
-
-static inline grub_disk_addr_t
-grub_partition_get_start (const grub_partition_t p)
-{
-  grub_partition_t part;
-  grub_uint64_t part_start = 0;
-
-  for (part = p; part; part = part->parent)
-    part_start += part->start;
-
-  return part_start;
-}
-
-static inline grub_uint64_t
-grub_partition_get_len (const grub_partition_t p)
-{
-  return p->len;
-}
-
-#endif /* ! GRUB_PART_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/smbios.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/smbios.h
@ -1,69 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2019  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_SMBIOS_HEADER
-#define GRUB_SMBIOS_HEADER	1
-
-#include <grub/symbol.h>
-#include <grub/types.h>
-
-#define GRUB_SMBIOS_TYPE_END_OF_TABLE ((grub_uint8_t)127)
-
-struct grub_smbios_ieps
-{
-  grub_uint8_t anchor[5]; /* "_DMI_" */
-  grub_uint8_t checksum;
-  grub_uint16_t table_length;
-  grub_uint32_t table_address;
-  grub_uint16_t structures;
-  grub_uint8_t revision;
-} GRUB_PACKED;
-
-struct grub_smbios_eps
-{
-  grub_uint8_t anchor[4]; /* "_SM_" */
-  grub_uint8_t checksum;
-  grub_uint8_t length; /* 0x1f */
-  grub_uint8_t version_major;
-  grub_uint8_t version_minor;
-  grub_uint16_t maximum_structure_size;
-  grub_uint8_t revision;
-  grub_uint8_t formatted[5];
-  struct grub_smbios_ieps intermediate;
-} GRUB_PACKED;
-
-struct grub_smbios_eps3
-{
-  grub_uint8_t anchor[5]; /* "_SM3_" */
-  grub_uint8_t checksum;
-  grub_uint8_t length; /* 0x18 */
-  grub_uint8_t version_major;
-  grub_uint8_t version_minor;
-  grub_uint8_t docrev;
-  grub_uint8_t revision;
-  grub_uint8_t reserved;
-  grub_uint32_t maximum_table_length;
-  grub_uint64_t table_address;
-} GRUB_PACKED;
-
-extern struct grub_smbios_eps *grub_machine_smbios_get_eps (void);
-extern struct grub_smbios_eps3 *grub_machine_smbios_get_eps3 (void);
-
-extern struct grub_smbios_eps *EXPORT_FUNC (grub_smbios_get_eps) (void);
-
-#endif /* ! GRUB_SMBIOS_HEADER */
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/ventoy.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/ventoy.h
@ -121,9 +121,6 @@ typedef struct ventoy_os_param
     * vtoy_reserved[2]: vtoy_chain_type     0:Linux    1:Windows  2:wimfile
     * vtoy_reserved[3]: vtoy_iso_format     0:iso9660  1:udf
     * vtoy_reserved[4]: vtoy_windows_cd_prompt
-     * vtoy_reserved[5]: vtoy_linux_remount
-     * vtoy_reserved[6]: vtoy_vlnk
-     * vtoy_reserved[7~10]: vtoy_disk_sig[4] used for vlnk
     *
     */
    grub_uint8_t   vtoy_reserved[32];    // Internal use by ventoy
@ -138,16 +135,7 @@ typedef struct ventoy_windows_data
 {
    char auto_install_script[384];
    char injection_archive[384];
-    grub_uint8_t windows11_bypass_check;
-
-    grub_uint32_t auto_install_len;
-
-    grub_uint8_t windows11_bypass_nro;
-
-    grub_uint8_t reserved[255 - 5];
-
-    /* auto_intall file buf */
-    /* ...... + auto_install_len */
+    grub_uint8_t reserved[256];
 }ventoy_windows_data;


@ -161,23 +149,11 @@ typedef struct ventoy_secure_data
    grub_uint8_t magic2[16];     /* VENTOY_GUID */
 }ventoy_secure_data;

-
-typedef struct ventoy_vlnk
-{
-    ventoy_guid   guid;         // VENTOY_GUID
-    grub_uint32_t crc32;        // crc32
-    grub_uint32_t disk_signature;
-    grub_uint64_t part_offset; // in bytes
-    char filepath[384];
-    grub_uint8_t reserved[96];
-}ventoy_vlnk;
-
 #pragma pack()

 // compile assert check : sizeof(ventoy_os_param) must be 512
 COMPILE_ASSERT(1,sizeof(ventoy_os_param) == 512);
 COMPILE_ASSERT(2,sizeof(ventoy_secure_data) == 4096);
-COMPILE_ASSERT(3,sizeof(ventoy_vlnk) == 512);



@ -264,9 +240,7 @@ typedef struct ventoy_img_chunk_list

 #pragma pack(1)

-#define VTOY_MAX_CONF_REPLACE    2
 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
-#define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF

 typedef const char * (*grub_env_get_pf)(const char *name);
 typedef int (*grub_env_set_pf)(const char *name, const char *val);
@ -285,7 +259,6 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
-    ventoy_grub_param_file_replace img_replace[VTOY_MAX_CONF_REPLACE];
    grub_env_printf_pf grub_env_printf;
 }ventoy_grub_param;

@ -294,7 +267,6 @@ typedef struct ventoy_grub_param
 int grub_ext_get_file_chunk(grub_uint64_t part_start, grub_file_t file, ventoy_img_chunk_list *chunk_list);
 int grub_fat_get_file_chunk(grub_uint64_t part_start, grub_file_t file, ventoy_img_chunk_list *chunk_list);
 void grub_iso9660_set_nojoliet(int nojoliet);
-int grub_iso9660_is_joliet(void);
 grub_uint64_t grub_iso9660_get_last_read_pos(grub_file_t file);
 grub_uint64_t grub_iso9660_get_last_file_dirent_pos(grub_file_t file);
 grub_uint64_t grub_udf_get_file_offset(grub_file_t file);
@ -306,7 +278,6 @@ grub_uint64_t grub_udf_get_last_file_attr_offset
    grub_uint64_t *fe_entry_size_offset
 );
 int ventoy_is_efi_os(void);
-void ventoy_memfile_env_set(const char *prefix, const void *buf, unsigned long long len);

 #endif /* __VENTOY_H__ */

--- a/GRUB2/MOD_SRC/grub-2.04/install.sh
+++ b/GRUB2/MOD_SRC/grub-2.04/install.sh
@ -9,17 +9,17 @@ mkdir -p $VT_DIR/GRUB2/PXE

 make install

-PATH=$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/:$PATH
+PATH=$PATH:$VT_DIR/GRUB2/INSTALL/bin/:$VT_DIR/GRUB2/INSTALL/sbin/

 net_modules_legacy="net tftp http"
-all_modules_legacy="file date drivemap blocklist newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal video_fb udf gfxmenu gfxterm gfxterm_background gfxterm_menu smbios"
+all_modules_legacy="file setkey date drivemap blocklist regexp newc vga_text ntldr search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio lspci pci ext2 xfs ventoy chain read halt iso9660 linux16 test true sleep reboot echo videotest videoinfo videotest_checksum video_colors video_cirrus video_bochs vga vbe video_fb font video gettext extcmd terminal  linux minicmd help configfile tr trig boot biosdisk disk ls tar squash4 password_pbkdf2 all_video png jpeg part_gpt part_msdos fat exfat ntfs loopback gzio normal  udf gfxmenu gfxterm gfxterm_background gfxterm_menu"

 net_modules_uefi="efinet net tftp http"
-all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu mouse fwload smbios zfs"
+all_modules_uefi="file setkey blocklist ventoy test true regexp newc search at_keyboard usb_keyboard  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux relocator jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop efi_uga video_bochs video_cirrus video video_fb gfxterm_background gfxterm_menu"

-all_modules_arm64_uefi="file setkey blocklist ventoy test true regexp newc search  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu zfs"
+all_modules_arm64_uefi="file setkey blocklist ventoy test true regexp newc search  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu"

-all_modules_mips64el_uefi="file setkey blocklist ventoy test true regexp newc search  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu zfs"
+all_modules_mips64el_uefi="file setkey blocklist ventoy test true regexp newc search  gcry_md5 hashsum gzio xzio lzopio ext2 xfs read halt sleep serial terminfo png password_pbkdf2 gcry_sha512 pbkdf2 part_gpt part_msdos ls tar squash4 loopback part_apple minicmd diskfilter linux jpeg iso9660 udf hfsplus halt acpi mmap gfxmenu video_colors trig bitmap_scale gfxterm bitmap font fat exfat ntfs fshelp efifwsetup reboot echo configfile normal terminal gettext chain  priority_queue bufio datetime cat extcmd crypto gzio boot all_video efi_gop video video_fb gfxterm_background gfxterm_menu"


 if [ "$1" = "uefi" ]; then
@ -97,8 +97,6 @@ elif [ "$1" = "arm64" ]; then
        if ! echo $all_modules | grep -q " ${line%.mod} "; then
            echo "Copy $line ..."
            cp -a $VT_DIR/GRUB2/INSTALL/lib/grub/arm64-efi/$line    $VT_DIR/INSTALL/grub/arm64-efi/
-            xz $VT_DIR/INSTALL/grub/arm64-efi/$line
-            mv $VT_DIR/INSTALL/grub/arm64-efi/${line}.xz $VT_DIR/INSTALL/grub/arm64-efi/${line}
        fi
    done
 elif [ "$1" = "mips64el" ]; then
--- a/GRUB2/MOD_SRC/grub-2.04/util/grub-install.c
+++ b/GRUB2/MOD_SRC/grub-2.04/util/grub-install.c
@ -1165,7 +1165,6 @@ main (int argc, char *argv[])
 	      break;
 	    case GRUB_INSTALL_PLATFORM_MIPS64EL_EFI:
 	      efi_file = "grubmips64el.efi";
-          break;
 	    case GRUB_INSTALL_PLATFORM_RISCV32_EFI:
 	      efi_file = "grubriscv32.efi";
 	      break;
--- a/GRUB2/MOD_SRC/grub-2.04/util/setup.c
+++ b/GRUB2/MOD_SRC/grub-2.04/util/setup.c
@ -1,878 +0,0 @@
-/* grub-setup.c - make GRUB usable */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <grub/types.h>
-#include <grub/emu/misc.h>
-#include <grub/util/misc.h>
-#include <grub/device.h>
-#include <grub/disk.h>
-#include <grub/file.h>
-#include <grub/fs.h>
-#include <grub/partition.h>
-#include <grub/env.h>
-#include <grub/emu/hostdisk.h>
-#include <grub/term.h>
-#include <grub/i18n.h>
-
-#ifdef GRUB_SETUP_SPARC64
-#include <grub/util/ofpath.h>
-#include <grub/sparc64/ieee1275/boot.h>
-#include <grub/sparc64/ieee1275/kernel.h>
-#else
-#include <grub/i386/pc/boot.h>
-#include <grub/i386/pc/kernel.h>
-#endif
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <assert.h>
-#include <grub/emu/getroot.h>
-#include "progname.h"
-#include <grub/reed_solomon.h>
-#include <grub/msdos_partition.h>
-#include <grub/crypto.h>
-#include <grub/util/install.h>
-#include <grub/emu/hostfile.h>
-
-#include <errno.h>
-
-/* On SPARC this program fills in various fields inside of the 'boot' and 'core'
- * image files.
- *
- * The 'boot' image needs to know the OBP path name of the root
- * device.  It also needs to know the initial block number of
- * 'core' (which is 'diskboot' concatenated with 'kernel' and
- * all the modules, this is created by grub-mkimage).  This resulting
- * 'boot' image is 512 bytes in size and is placed in the second block
- * of a partition.
- *
- * The initial 'diskboot' block acts as a loader for the actual GRUB
- * kernel.  It contains the loading code and then a block list.
- *
- * The block list of 'core' starts at the end of the 'diskboot' image
- * and works it's way backwards towards the end of the code of 'diskboot'.
- *
- * We patch up the images with the necessary values and write out the
- * result.
- */
-
-#ifdef GRUB_SETUP_SPARC64
-#define grub_target_to_host16(x)	grub_be_to_cpu16(x)
-#define grub_target_to_host32(x)	grub_be_to_cpu32(x)
-#define grub_target_to_host64(x)	grub_be_to_cpu64(x)
-#define grub_host_to_target16(x)	grub_cpu_to_be16(x)
-#define grub_host_to_target32(x)	grub_cpu_to_be32(x)
-#define grub_host_to_target64(x)	grub_cpu_to_be64(x)
-#elif defined (GRUB_SETUP_BIOS)
-#define grub_target_to_host16(x)	grub_le_to_cpu16(x)
-#define grub_target_to_host32(x)	grub_le_to_cpu32(x)
-#define grub_target_to_host64(x)	grub_le_to_cpu64(x)
-#define grub_host_to_target16(x)	grub_cpu_to_le16(x)
-#define grub_host_to_target32(x)	grub_cpu_to_le32(x)
-#define grub_host_to_target64(x)	grub_cpu_to_le64(x)
-#else
-#error Complete this
-#endif
-
-static void
-write_rootdev (grub_device_t root_dev,
-	       char *boot_img, grub_uint64_t first_sector)
-{
-#ifdef GRUB_SETUP_BIOS
-  {
-    grub_uint8_t *boot_drive;
-    void *kernel_sector;
-    boot_drive = (grub_uint8_t *) (boot_img + GRUB_BOOT_MACHINE_BOOT_DRIVE);
-    kernel_sector = (boot_img + GRUB_BOOT_MACHINE_KERNEL_SECTOR);
-
-    /* FIXME: can this be skipped?  */
-    *boot_drive = 0xFF;
-
-    grub_set_unaligned64 (kernel_sector, grub_cpu_to_le64 (first_sector));
-  }
-#endif
-#ifdef GRUB_SETUP_SPARC64
-  {
-    void *kernel_byte;
-    kernel_byte = (boot_img + GRUB_BOOT_AOUT_HEADER_SIZE
-		   + GRUB_BOOT_MACHINE_KERNEL_BYTE);
-    grub_set_unaligned64 (kernel_byte,
-			  grub_cpu_to_be64 (first_sector << GRUB_DISK_SECTOR_BITS));
-  }
-#endif
-}
-
-#ifdef GRUB_SETUP_SPARC64
-#define BOOT_SECTOR 1
-#else
-#define BOOT_SECTOR 0
-#endif
-
-/* Helper for setup.  */
-
-struct blocklists
-{
-  struct grub_boot_blocklist *first_block, *block;
-#ifdef GRUB_SETUP_BIOS
-  grub_uint16_t current_segment;
-#endif
-#ifdef GRUB_SETUP_SPARC64
-  grub_uint64_t gpt_offset;
-#endif
-  grub_uint16_t last_length;
-  grub_disk_addr_t first_sector;
-};
-
-/* Helper for setup.  */
-static void
-save_blocklists (grub_disk_addr_t sector, unsigned offset, unsigned length,
-		 void *data)
-{
-  struct blocklists *bl = data;
-  struct grub_boot_blocklist *prev = bl->block + 1;
-  grub_uint64_t seclen;
-
-#ifdef GRUB_SETUP_SPARC64
-  sector -= bl->gpt_offset;
-#endif
-
-  grub_util_info ("saving <%"  GRUB_HOST_PRIuLONG_LONG ",%u,%u>",
-		  (unsigned long long) sector, offset, length);
-
-  if (bl->first_sector == (grub_disk_addr_t) -1)
-    {
-      if (offset != 0 || length < GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("%s", _("the first sector of the core file is not sector-aligned"));
-
-      bl->first_sector = sector;
-      sector++;
-      length -= GRUB_DISK_SECTOR_SIZE;
-      if (!length)
-	return;
-    }
-
-  if (offset != 0 || bl->last_length != 0)
-    grub_util_error ("%s", _("non-sector-aligned data is found in the core file"));
-
-  seclen = (length + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS;
-
-  if (bl->block != bl->first_block
-      && (grub_target_to_host64 (prev->start)
-	  + grub_target_to_host16 (prev->len)) == sector)
-    {
-      grub_uint16_t t = grub_target_to_host16 (prev->len);
-      t += seclen;
-      prev->len = grub_host_to_target16 (t);
-    }
-  else
-    {
-      bl->block->start = grub_host_to_target64 (sector);
-      bl->block->len = grub_host_to_target16 (seclen);
-#ifdef GRUB_SETUP_BIOS
-      bl->block->segment = grub_host_to_target16 (bl->current_segment);
-#endif
-
-      bl->block--;
-      if (bl->block->len)
-	grub_util_error ("%s", _("the sectors of the core file are too fragmented"));
-    }
-
-  bl->last_length = length & (GRUB_DISK_SECTOR_SIZE - 1);
-#ifdef GRUB_SETUP_BIOS
-  bl->current_segment += seclen << (GRUB_DISK_SECTOR_BITS - 4);
-#endif
-}
-
-/* Context for setup/identify_partmap.  */
-struct identify_partmap_ctx
-{
-  grub_partition_map_t dest_partmap;
-  grub_partition_t container;
-  int multiple_partmaps;
-};
-
-/* Helper for setup.
-   Unlike root_dev, with dest_dev we're interested in the partition map even
-   if dest_dev itself is a whole disk.  */
-static int
-identify_partmap (grub_disk_t disk __attribute__ ((unused)),
-		  const grub_partition_t p, void *data)
-{
-  struct identify_partmap_ctx *ctx = data;
-
-  if (p->parent != ctx->container)
-    return 0;
-  /* NetBSD and OpenBSD subpartitions have metadata inside a partition,
-     so they are safe to ignore.
-   */
-  if (grub_strcmp (p->partmap->name, "netbsd") == 0
-      || grub_strcmp (p->partmap->name, "openbsd") == 0)
-    return 0;
-  if (ctx->dest_partmap == NULL)
-    {
-      ctx->dest_partmap = p->partmap;
-      return 0;
-    }
-  if (ctx->dest_partmap == p->partmap)
-    return 0;
-  ctx->multiple_partmaps = 1;
-  return 1;
-}
-
-#ifdef GRUB_SETUP_BIOS
-#define SETUP grub_util_bios_setup
-#elif GRUB_SETUP_SPARC64
-#define SETUP grub_util_sparc_setup
-#else
-#error "Shouldn't happen"
-#endif
-
-void
-SETUP (const char *dir,
-       const char *boot_file, const char *core_file,
-       const char *dest, int force,
-       int fs_probe, int allow_floppy,
-       int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */
-{
-  char *core_path;
-  char *boot_img, *core_img, *boot_path;
-  char *root = 0;
-  size_t boot_size, core_size;
-  grub_uint16_t core_sectors;
-  grub_device_t root_dev = 0, dest_dev, core_dev;
-  grub_util_fd_t fp;
-  struct blocklists bl;
-
-  bl.first_sector = (grub_disk_addr_t) -1;
-
-#ifdef GRUB_SETUP_BIOS
-  bl.current_segment =
-    GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
-#endif
-  bl.last_length = 0;
-
-  /* Read the boot image by the OS service.  */
-  boot_path = grub_util_get_path (dir, boot_file);
-  boot_size = grub_util_get_image_size (boot_path);
-  if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is not %u"),
-		     boot_path, GRUB_DISK_SECTOR_SIZE);
-  boot_img = grub_util_read_image (boot_path);
-  free (boot_path);
-
-  core_path = grub_util_get_path (dir, core_file);
-  core_size = grub_util_get_image_size (core_path);
-  core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
-		  >> GRUB_DISK_SECTOR_BITS);
-  if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is too small"), core_path);
-#ifdef GRUB_SETUP_BIOS
-  if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is too large"), core_path);
-#endif
-
-  core_img = grub_util_read_image (core_path);
-
-  /* Have FIRST_BLOCK to point to the first blocklist.  */
-  bl.first_block = (struct grub_boot_blocklist *) (core_img
-						   + GRUB_DISK_SECTOR_SIZE
-						   - sizeof (*bl.block));
-
-  grub_util_info ("Opening dest `%s'", dest);
-  dest_dev = grub_device_open (dest);
-  if (! dest_dev)
-    grub_util_error ("%s", grub_errmsg);
-
-  core_dev = dest_dev;
-
-  {
-    char **root_devices = grub_guess_root_devices (dir);
-    char **cur;
-    int found = 0;
-
-    if (!root_devices)
-      grub_util_error (_("cannot find a device for %s (is /dev mounted?)"), dir);
-
-    for (cur = root_devices; *cur; cur++)
-      {
-	char *drive;
-	grub_device_t try_dev;
-
-	drive = grub_util_get_grub_dev (*cur);
-	if (!drive)
-	  continue;
-	try_dev = grub_device_open (drive);
-	if (! try_dev)
-	  {
-	    free (drive);
-	    continue;
-	  }
-	if (!found && try_dev->disk->id == dest_dev->disk->id
-	    && try_dev->disk->dev->id == dest_dev->disk->dev->id)
-	  {
-	    if (root_dev)
-	      grub_device_close (root_dev);
-	    free (root);
-	    root_dev = try_dev;
-	    root = drive;
-	    found = 1;
-	    continue;
-	  }
-	if (!root_dev)
-	  {
-	    root_dev = try_dev;
-	    root = drive;
-	    continue;
-	  }
-	grub_device_close (try_dev);	
-	free (drive);
-      }
-    if (!root_dev)
-      {
-        root = grub_util_get_grub_dev ("/dev/sda");
-        root_dev = grub_device_open (root);
-        if (root_dev)
-	        grub_util_info ("guessing the root device failed, because of `%s'", grub_errmsg);
-	    else
-    	    grub_util_error ("guessing the root device failed, because of `%s'", grub_errmsg);
-      }
-    grub_util_info ("guessed root_dev `%s' from "
-		    "dir `%s'", root_dev->disk->name, dir);
-
-    for (cur = root_devices; *cur; cur++)
-      free (*cur);
-    free (root_devices);
-  }
-
-  grub_util_info ("setting the root device to `%s'", root);
-  if (grub_env_set ("root", root) != GRUB_ERR_NONE)
-    grub_util_error ("%s", grub_errmsg);
-
-  {
-#ifdef GRUB_SETUP_BIOS
-    char *tmp_img;
-    grub_uint8_t *boot_drive_check;
-
-    /* Read the original sector from the disk.  */
-    tmp_img = xmalloc (GRUB_DISK_SECTOR_SIZE);
-    if (grub_disk_read (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, tmp_img))
-      grub_util_error ("%s", grub_errmsg);
-    
-    boot_drive_check = (grub_uint8_t *) (boot_img
-					  + GRUB_BOOT_MACHINE_DRIVE_CHECK);
-    /* Copy the possible DOS BPB.  */
-    memcpy (boot_img + GRUB_BOOT_MACHINE_BPB_START,
-	    tmp_img + GRUB_BOOT_MACHINE_BPB_START,
-	    GRUB_BOOT_MACHINE_BPB_END - GRUB_BOOT_MACHINE_BPB_START);
-
-    /* If DEST_DRIVE is a hard disk, enable the workaround, which is
-       for buggy BIOSes which don't pass boot drive correctly. Instead,
-       they pass 0x00 or 0x01 even when booted from 0x80.  */
-    if (!allow_floppy && !grub_util_biosdisk_is_floppy (dest_dev->disk))
-      {
-	/* Replace the jmp (2 bytes) with double nop's.  */
-	boot_drive_check[0] = 0x90;
-	boot_drive_check[1] = 0x90;
-      }
-#endif
-
-    struct identify_partmap_ctx ctx = {
-      .dest_partmap = NULL,
-      .container = dest_dev->disk->partition,
-      .multiple_partmaps = 0
-    };
-    int is_ldm;
-    grub_err_t err;
-    grub_disk_addr_t *sectors;
-    int i;
-    grub_fs_t fs;
-    unsigned int nsec, maxsec;
-
-    grub_partition_iterate (dest_dev->disk, identify_partmap, &ctx);
-
-#ifdef GRUB_SETUP_BIOS
-    /* Copy the partition table.  */
-    if (ctx.dest_partmap ||
-        (!allow_floppy && !grub_util_biosdisk_is_floppy (dest_dev->disk)))
-      memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	      tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	      GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
-
-    free (tmp_img);
-#endif
-
-    if (ctx.container
-	&& grub_strcmp (ctx.container->partmap->name, "msdos") == 0
-	&& ctx.dest_partmap
-	&& (ctx.container->msdostype == GRUB_PC_PARTITION_TYPE_NETBSD
-	    || ctx.container->msdostype == GRUB_PC_PARTITION_TYPE_OPENBSD))
-      {
-	grub_util_warn ("%s", _("Attempting to install GRUB to a disk with multiple partition labels or both partition label and filesystem.  This is not supported yet."));
-	goto unable_to_embed;
-      }
-
-    fs = grub_fs_probe (dest_dev);
-    if (!fs)
-      grub_errno = GRUB_ERR_NONE;
-
-    is_ldm = grub_util_is_ldm (dest_dev->disk);
-
-    if (fs_probe)
-      {
-	if (!fs && !ctx.dest_partmap)
-	  grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
-			   dest_dev->disk->name);
-	if (fs && !fs->reserved_first_sector)
-	  /* TRANSLATORS: Filesystem may reserve the space just GRUB isn't sure about it.  */
-	  grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
-			     "reserve space for DOS-style boot.  Installing GRUB there could "
-			     "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
-			     "by grub-setup (--skip-fs-probe disables this "
-			     "check, use at your own risk)"), dest_dev->disk->name, fs->name);
-
-	if (ctx.dest_partmap && strcmp (ctx.dest_partmap->name, "msdos") != 0
-	    && strcmp (ctx.dest_partmap->name, "gpt") != 0
-	    && strcmp (ctx.dest_partmap->name, "bsd") != 0
-	    && strcmp (ctx.dest_partmap->name, "netbsd") != 0
-	    && strcmp (ctx.dest_partmap->name, "openbsd") != 0
-	    && strcmp (ctx.dest_partmap->name, "sunpc") != 0)
-	  /* TRANSLATORS: Partition map may reserve the space just GRUB isn't sure about it.  */
-	  grub_util_error (_("%s appears to contain a %s partition map which isn't known to "
-			     "reserve space for DOS-style boot.  Installing GRUB there could "
-			     "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
-			     "by grub-setup (--skip-fs-probe disables this "
-			     "check, use at your own risk)"), dest_dev->disk->name, ctx.dest_partmap->name);
-	if (is_ldm && ctx.dest_partmap && strcmp (ctx.dest_partmap->name, "msdos") != 0
-	    && strcmp (ctx.dest_partmap->name, "gpt") != 0)
-	  grub_util_error (_("%s appears to contain a %s partition map and "
-			     "LDM which isn't known to be a safe combination."
-			     "  Installing GRUB there could "
-			     "result in FILESYSTEM DESTRUCTION if valuable data"
-			     " is overwritten "
-			     "by grub-setup (--skip-fs-probe disables this "
-			     "check, use at your own risk)"),
-			   dest_dev->disk->name, ctx.dest_partmap->name);
-
-      }
-
-    if (! ctx.dest_partmap && ! fs && !is_ldm)
-      {
-	grub_util_warn ("%s", _("Attempting to install GRUB to a partitionless disk or to a partition.  This is a BAD idea."));
-	goto unable_to_embed;
-      }
-    if (ctx.multiple_partmaps || (ctx.dest_partmap && fs) || (is_ldm && fs))
-      {
-	grub_util_warn ("%s", _("Attempting to install GRUB to a disk with multiple partition labels.  This is not supported yet."));
-	goto unable_to_embed;
-      }
-
-    if (ctx.dest_partmap && !ctx.dest_partmap->embed)
-      {
-	grub_util_warn (_("Partition style `%s' doesn't support embedding"),
-			ctx.dest_partmap->name);
-	goto unable_to_embed;
-      }
-
-    if (fs && !fs->fs_embed)
-      {
-	grub_util_warn (_("File system `%s' doesn't support embedding"),
-			fs->name);
-	goto unable_to_embed;
-      }
-
-    nsec = core_sectors;
-
-    if (add_rs_codes)
-      maxsec = 2 * core_sectors;
-    else
-      maxsec = core_sectors;
-
-#ifdef GRUB_SETUP_BIOS
-    if (maxsec > ((0x78000 - GRUB_KERNEL_I386_PC_LINK_ADDR)
-		>> GRUB_DISK_SECTOR_BITS))
-      maxsec = ((0x78000 - GRUB_KERNEL_I386_PC_LINK_ADDR)
-		>> GRUB_DISK_SECTOR_BITS);
-#endif
-
-#ifdef GRUB_SETUP_SPARC64
-    /*
-     * On SPARC we need two extra. One is because we are combining the
-     * core.img with the boot.img. The other is because the boot sector
-     * starts at 1.
-     */
-    nsec += 2;
-    maxsec += 2;
-#endif
-
-    if (is_ldm)
-      err = grub_util_ldm_embed (dest_dev->disk, &nsec, maxsec,
-				 GRUB_EMBED_PCBIOS, &sectors);
-    else if (ctx.dest_partmap)
-      err = ctx.dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
-				     GRUB_EMBED_PCBIOS, &sectors);
-    else
-      err = fs->fs_embed (dest_dev, &nsec, maxsec,
-			  GRUB_EMBED_PCBIOS, &sectors);
-    if (!err && nsec < core_sectors)
-      {
-	err = grub_error (GRUB_ERR_OUT_OF_RANGE,
-			  N_("Your embedding area is unusually small.  "
-			     "core.img won't fit in it."));
-      }
-    
-    if (err)
-      {
-	grub_util_warn ("%s", grub_errmsg);
-	grub_errno = GRUB_ERR_NONE;
-	goto unable_to_embed;
-      }
-
-    assert (nsec <= maxsec);
-
-    /* Clean out the blocklists.  */
-    bl.block = bl.first_block;
-    while (bl.block->len)
-      {
-	grub_memset (bl.block, 0, sizeof (*bl.block));
-      
-	bl.block--;
-
-	if ((char *) bl.block <= core_img)
-	  grub_util_error ("%s", _("no terminator in the core image"));
-      }
-
-    bl.block = bl.first_block;
-    for (i = 0; i < nsec; i++)
-      save_blocklists (sectors[i] + grub_partition_get_start (ctx.container),
-		       0, GRUB_DISK_SECTOR_SIZE, &bl);
-
-    /* Make sure that the last blocklist is a terminator.  */
-    if (bl.block == bl.first_block)
-      bl.block--;
-    bl.block->start = 0;
-    bl.block->len = 0;
-#ifdef GRUB_SETUP_BIOS
-    bl.block->segment = 0;
-#endif
-
-#ifdef GRUB_SETUP_SPARC64
-    {
-      /*
-       * On SPARC, the block-list entries need to be based off the beginning
-       * of the parition, not the beginning of the disk.
-       */
-      struct grub_boot_blocklist *block;
-      block = bl.first_block;
-
-      while (block->len)
-        {
-          block->start -= bl.first_sector;
-          block--;
-        }
-    }
-
-    /*
-     * Reserve space for the boot block since it can not be in the
-     * Parition table on SPARC.
-     */
-    assert (bl.first_block->len > 2);
-    bl.first_block->start += 2;
-    bl.first_block->len -= 2;
-    write_rootdev (root_dev, boot_img, sectors[BOOT_SECTOR + 1] - bl.first_sector);
-#endif
-
-#ifdef GRUB_SETUP_BIOS
-    write_rootdev (root_dev, boot_img, bl.first_sector);
-#endif
-
-    /* Round up to the nearest sector boundary, and zero the extra memory */
-    core_img = xrealloc (core_img, nsec * GRUB_DISK_SECTOR_SIZE);
-    assert (core_img && (nsec * GRUB_DISK_SECTOR_SIZE >= core_size));
-    memset (core_img + core_size, 0, nsec * GRUB_DISK_SECTOR_SIZE - core_size);
-
-    bl.first_block = (struct grub_boot_blocklist *) (core_img
-						     + GRUB_DISK_SECTOR_SIZE
-						     - sizeof (*bl.block));
-#if GRUB_SETUP_BIOS
-    grub_size_t no_rs_length;
-    no_rs_length = grub_target_to_host16 
-      (grub_get_unaligned16 (core_img
-			     + GRUB_DISK_SECTOR_SIZE
-			     + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH));
-
-    if (no_rs_length == 0xffff)
-      grub_util_error ("%s", _("core.img version mismatch"));
-
-    if (add_rs_codes)
-      {
-	grub_set_unaligned32 ((core_img + GRUB_DISK_SECTOR_SIZE
-			       + GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY),
-			      grub_host_to_target32 (nsec * GRUB_DISK_SECTOR_SIZE - core_size));
-
-	void *tmp = xmalloc (core_size);
-	grub_memcpy (tmp, core_img, core_size);
-	grub_reed_solomon_add_redundancy (core_img + no_rs_length + GRUB_DISK_SECTOR_SIZE,
-					  core_size - no_rs_length - GRUB_DISK_SECTOR_SIZE,
-					  nsec * GRUB_DISK_SECTOR_SIZE
-					  - core_size);
-	assert (grub_memcmp (tmp, core_img, core_size) == 0);
-	free (tmp);
-      }
-
-    /* Write the core image onto the disk.  */
-    for (i = 0; i < nsec; i++)
-      grub_disk_write (dest_dev->disk, sectors[i], 0,
-		       GRUB_DISK_SECTOR_SIZE,
-		       core_img + i * GRUB_DISK_SECTOR_SIZE);
-#endif
-
-#ifdef GRUB_SETUP_SPARC64
-    {
-      int isec = BOOT_SECTOR;
-
-      /* Write the boot image onto the disk. */
-      if (grub_disk_write (dest_dev->disk, sectors[isec++], 0,
-                           GRUB_DISK_SECTOR_SIZE, boot_img))
-        grub_util_error ("%s", grub_errmsg);
-
-      /* Write the core image onto the disk. */
-      for (i = 0 ; isec < nsec; i++, isec++)
-        {
-          if (grub_disk_write (dest_dev->disk, sectors[isec], 0,
-                               GRUB_DISK_SECTOR_SIZE,
-                               core_img  + i * GRUB_DISK_SECTOR_SIZE))
-            grub_util_error ("%s", grub_errmsg);
-        }
-    }
-
-#endif
-    grub_free (sectors);
-
-    goto finish;
-  }
-
-unable_to_embed:
-
-  if (dest_dev->disk->dev->id != root_dev->disk->dev->id)
-    grub_util_error ("%s", _("embedding is not possible, but this is required for "
-			     "RAID and LVM install"));
-
-  {
-    grub_fs_t fs;
-    fs = grub_fs_probe (root_dev);
-    if (!fs)
-      grub_util_error (_("can't determine filesystem on %s"), root);
-
-    if (!fs->blocklist_install)
-      grub_util_error (_("filesystem `%s' doesn't support blocklists"),
-		       fs->name);
-  }
-
-#ifdef GRUB_SETUP_BIOS
-  if (dest_dev->disk->id != root_dev->disk->id
-      || dest_dev->disk->dev->id != root_dev->disk->dev->id)
-    /* TRANSLATORS: cross-disk refers to /boot being on one disk
-       but MBR on another.  */
-    grub_util_error ("%s", _("embedding is not possible, but this is required for "
-			     "cross-disk install"));
-#else
-  core_dev = root_dev;
-#endif
-
-  grub_util_warn ("%s", _("Embedding is not possible.  GRUB can only be installed in this "
-			  "setup by using blocklists.  However, blocklists are UNRELIABLE and "
-			  "their use is discouraged."));
-  if (! force)
-    /* TRANSLATORS: Here GRUB refuses to continue with blocklist install.  */
-    grub_util_error ("%s", _("will not proceed with blocklists"));
-
-  /* The core image must be put on a filesystem unfortunately.  */
-  grub_util_info ("will leave the core image on the filesystem");
-
-  grub_util_biosdisk_flush (root_dev->disk);
-
-  /* Clean out the blocklists.  */
-  bl.block = bl.first_block;
-  while (bl.block->len)
-    {
-      bl.block->start = 0;
-      bl.block->len = 0;
-#ifdef GRUB_SETUP_BIOS
-      bl.block->segment = 0;
-#endif
-
-      bl.block--;
-
-      if ((char *) bl.block <= core_img)
-	grub_util_error ("%s", _("no terminator in the core image"));
-    }
-
-  bl.block = bl.first_block;
-
-#ifdef GRUB_SETUP_SPARC64
-  {
-    grub_partition_t container = root_dev->disk->partition;
-    bl.gpt_offset = 0;
-
-    if (grub_strstr (container->partmap->name, "gpt"))
-      bl.gpt_offset = grub_partition_get_start (container);
-  }
-#endif
-
-  grub_install_get_blocklist (root_dev, core_path, core_img, core_size,
-			      save_blocklists, &bl);
-
-  if (bl.first_sector == (grub_disk_addr_t)-1)
-    grub_util_error ("%s", _("can't retrieve blocklists"));
-
-#ifdef GRUB_SETUP_SPARC64
-  {
-    char *boot_devpath;
-    boot_devpath = (char *) (boot_img
-			     + GRUB_BOOT_AOUT_HEADER_SIZE
-			     + GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-    if (dest_dev->disk->id != root_dev->disk->id
-	|| dest_dev->disk->dev->id != root_dev->disk->dev->id)
-      {
-	char *dest_ofpath;
-	dest_ofpath
-	  = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (root_dev->disk));
-	/* FIXME handle NULL result */
-	grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
-	strncpy (boot_devpath, dest_ofpath,
-		 GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-		 - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1);
-	boot_devpath[GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-		   - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1] = 0;
-	free (dest_ofpath);
-      }
-    else
-      {
-	grub_util_info ("non cross-disk install");
-	memset (boot_devpath, 0, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-		- GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-      }
-    grub_util_info ("boot device path %s", boot_devpath);
-  }
-#endif
-
-  write_rootdev (root_dev, boot_img, bl.first_sector);
-
-  /* Write the first two sectors of the core image onto the disk.  */
-  grub_util_info ("opening the core image `%s'", core_path);
-  fp = grub_util_fd_open (core_path, GRUB_UTIL_FD_O_WRONLY);
-  if (! GRUB_UTIL_FD_IS_VALID (fp))
-    grub_util_error (_("cannot open `%s': %s"), core_path,
-		     grub_util_fd_strerror ());
-
-  if (grub_util_fd_write (fp, core_img, GRUB_DISK_SECTOR_SIZE * 2)
-      != GRUB_DISK_SECTOR_SIZE * 2)
-    grub_util_error (_("cannot write to `%s': %s"),
-		     core_path, strerror (errno));
-  if (grub_util_fd_sync (fp) < 0)
-    grub_util_error (_("cannot sync `%s': %s"), core_path, strerror (errno));
-  if (grub_util_fd_close (fp) < 0)
-    grub_util_error (_("cannot close `%s': %s"), core_path, strerror (errno));
-  grub_util_biosdisk_flush (root_dev->disk);
-
-  grub_disk_cache_invalidate_all ();
-
-  {
-    char *buf, *ptr = core_img;
-    size_t len = core_size;
-    grub_uint64_t blk, offset = 0;
-    grub_partition_t container = core_dev->disk->partition;
-    grub_err_t err;
-
-    core_dev->disk->partition = 0;
-#ifdef GRUB_SETUP_SPARC64
-    offset = bl.gpt_offset;
-#endif
-
-    buf = xmalloc (core_size);
-    blk = bl.first_sector;
-    err = grub_disk_read (core_dev->disk, blk + offset, 0, GRUB_DISK_SECTOR_SIZE, buf);
-    if (err)
-      grub_util_error (_("cannot read `%s': %s"), core_dev->disk->name,
-		       grub_errmsg);
-    if (grub_memcmp (buf, ptr, GRUB_DISK_SECTOR_SIZE) != 0)
-      grub_util_error ("%s", _("blocklists are invalid"));
-
-    ptr += GRUB_DISK_SECTOR_SIZE;
-    len -= GRUB_DISK_SECTOR_SIZE;
-
-    bl.block = bl.first_block;
-    while (bl.block->len)
-      {
-	size_t cur = grub_target_to_host16 (bl.block->len) << GRUB_DISK_SECTOR_BITS;
-	blk = grub_target_to_host64 (bl.block->start);
-
-	if (cur > len)
-	  cur = len;
-
-	err = grub_disk_read (core_dev->disk, blk + offset, 0, cur, buf);
-	if (err)
-	  grub_util_error (_("cannot read `%s': %s"), core_dev->disk->name,
-			   grub_errmsg);
-
-	if (grub_memcmp (buf, ptr, cur) != 0)
-	  grub_util_error ("%s", _("blocklists are invalid"));
-
-	ptr += cur;
-	len -= cur;
-	bl.block--;
-	
-	if ((char *) bl.block <= core_img)
-	  grub_util_error ("%s", _("no terminator in the core image"));
-      }
-    if (len)
-      grub_util_error ("%s", _("blocklists are incomplete"));
-    core_dev->disk->partition = container;
-    free (buf);
-  }
-
-#ifdef GRUB_SETUP_BIOS
- finish:
-#endif
-
-  /* Write the boot image onto the disk.  */
-  if (grub_disk_write (dest_dev->disk, BOOT_SECTOR,
-		       0, GRUB_DISK_SECTOR_SIZE, boot_img))
-    grub_util_error ("%s", grub_errmsg);
-
-#ifdef GRUB_SETUP_SPARC64
- finish:
-#endif
-
-  grub_util_biosdisk_flush (root_dev->disk);
-  grub_util_biosdisk_flush (dest_dev->disk);
-
-  free (core_path);
-  free (core_img);
-  free (boot_img);
-  grub_device_close (dest_dev);
-  grub_device_close (root_dev);
-}
-
--- a/ICON/filechecksum.gif
+++ b/ICON/filechecksum.gif
--- a/IMG/cpio/sbin/init
+++ b/IMG/cpio/sbin/init
@ -48,12 +48,6 @@ else
    fi
 fi

-if [ "$VTOY_ARCH" = "i386" ]; then
-    if $BUSYBOX_PATH/vtchmod32 -6; then
-        export VTOY_ARCH=x86_64
-    fi
-fi
-
 echo $VTOY_ARCH > $VTOY_PATH/ventoy_arch


@ -87,7 +81,6 @@ export PATH=$BUSYBOX_PATH/:$VTOY_PATH/tool

 export VTOY_BREAK_LEVEL=$(hexdump -n 1 -s 449 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param)
 export VTOY_DEBUG_LEVEL=$(hexdump -n 1 -s 450 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param)
-export VTOY_LINUX_REMOUNT=$(hexdump -n 1 -s 454 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param)

 #Fixme: busybox shell output redirect seems to have some bug in rhel5
 if uname -a | grep -q el5; then
@ -115,8 +108,6 @@ fi

 if [ "$VTOY_ARCH" = "x86_64" ]; then
    echo "Use x86_64 busybox toolkit ..." >>$VTLOG
-    $BUSYBOX_PATH/xzcat $BUSYBOX_PATH/xzcat64_musl.xz > $BUSYBOX_PATH/xzcat_musl
-    $BUSYBOX_PATH/chmod +x $BUSYBOX_PATH/xzcat_musl
    ln -s $BUSYBOX_PATH/xzminidec64 $BUSYBOX_PATH/xzminidec
    ln -s $VTOY_PATH/tool/dmsetup64 $VTOY_PATH/tool/dmsetup
    ln -s $VTOY_PATH/tool/lunzip64 $VTOY_PATH/tool/lunzip
@ -126,17 +117,10 @@ if [ "$VTOY_ARCH" = "x86_64" ]; then
    ln -s $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat
 elif [ "$VTOY_ARCH" = "i386" ]; then
    echo "Use i386 busybox toolkit ..." >>$VTLOG
-    $BUSYBOX_PATH/xzcat $BUSYBOX_PATH/xzcat32_musl.xz > $BUSYBOX_PATH/xzcat_musl
-    $BUSYBOX_PATH/chmod +x $BUSYBOX_PATH/xzcat_musl
    ln -s $BUSYBOX_PATH/xzminidec32 $BUSYBOX_PATH/xzminidec
    ln -s $VTOY_PATH/tool/dmsetup32 $VTOY_PATH/tool/dmsetup
    ln -s $VTOY_PATH/tool/lunzip32 $VTOY_PATH/tool/lunzip

-    if uname -a | egrep -q 'x86_64|amd64'; then
-        echo "zstdcat use 64bit ..." >>$VTLOG
-        rm -f $VTOY_PATH/tool/zstdcat
-        ln -s $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat
-    fi
 elif [ "$VTOY_ARCH" = "mips64el" ]; then
    echo "Use MIPS64 busybox toolkit ..." >>$VTLOG
    ln -s $BUSYBOX_PATH/xzminidecm64e $BUSYBOX_PATH/xzminidec
--- a/IMG/cpio/ventoy/hook/alpine/insert.sh
+++ b/IMG/cpio/ventoy/hook/alpine/insert.sh
@ -1,4 +0,0 @@
-for i in 1 2; do 
-if [ $i -eq 2 ]; then
-    /ventoy/busybox/sh /ventoy/hook/alpine/udev_disk_hook.sh
-fi
--- a/IMG/cpio/ventoy/hook/alpine/udev_disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/alpine/udev_disk_hook.sh
@ -19,17 +19,22 @@

 . /ventoy/hook/ventoy-hook-lib.sh

-PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
-
-wait_for_usb_disk_ready
-
-vtdiskname=$(get_ventoy_disk_name)
-if [ "$vtdiskname" = "unknown" ]; then
-    vtlog "ventoy disk not found"
-    PATH=$VTPATH_OLD
+if [ "$SUBSYSTEM" != "block" ] || [ "$DEVTYPE" != "partition" ]; then    
    exit 0
 fi

+if [ -b /dev/${MDEV:0:-1} ]; then
+    vtlog "/dev/${MDEV:0:-1} exist"
+else
+    $SLEEP 2
+fi
+
+if is_ventoy_hook_finished || not_ventoy_disk "${MDEV:0:-1}"; then
+    exit 0
+fi
+
+PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
 #
 # longpanda:
 # Alpine initramfs doesn't contain dm-mod or fuse module, 
@ -42,17 +47,13 @@ fi
 #   3. unmount and delete the squashfs file
 #

-MDEV="${vtdiskname#/dev/}2"
-
 vtoydm -i -f $VTOY_PATH/ventoy_image_map -d /dev/${MDEV:0:-1} > $VTOY_PATH/iso_file_list

 vtLine=$(grep '[-][-] modloop-lts ' $VTOY_PATH/iso_file_list)
 sector=$(echo $vtLine | awk '{print $(NF-1)}')
 length=$(echo $vtLine | awk '{print $NF}')

-echo -n "Mounting boot media, please wait ......"
 vtoydm -e -f $VTOY_PATH/ventoy_image_map -d /dev/${MDEV:0:-1} -s $sector -l $length -o /vt_modloop
-echo "done"

 mkdir -p $VTOY_PATH/mnt
 mount /vt_modloop $VTOY_PATH/mnt
--- a/Show More
+++ b/Show More