vasilito/hiperiso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: copy hiperiso EFI binaries to data partition during install

Browse Source 
The chain boot path looks for hiperiso_x64.efi in /hiperiso/ on the data
partition. Without this, booting ISOs (non-memdisk) fails with
'ventoy not ready chain empty failed'.

The installer now mounts the data partition after writing the ESP image
and copies ./hiperiso/* (hiperiso_x64.efi, iso9660_x64.efi, udf_x64.efi,
vtoyutil_x64.efi, wimboot, memdisk, etc.) to it. This makes the ISO
chain boot work for non-memdisk boot modes.
This commit is contained in:
vasilito
2026-07-02 06:32:43 +03:00
parent 9089553607
commit b459cd8732
80 changed files with 112 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/grub2/Makefile.core.def
+1 -1
View File
@@ -1620,7 +1620,7 @@ module = {
common = gfxmenu/gui_string_util.c;
};
/* Added by longpanda for Hiperiso Project */
/* Added by longpanda for the Hiperiso Project (built upon Ventoy by longpanda) */
module = {
name = hiperiso;
common = hiperiso/hiperiso.c;
src/grub2/grub/grub.cfg
+10 -10
View File
@@ -1,5 +1,5 @@
#************************************************************************************
# Copyright (c) 2020, longpanda <admin@hiperiso.net>
# Copyright (c) 2020, longpanda <adminpupkin@gmail.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -2149,8 +2149,8 @@ function hiperiso_img_openwrt {
set openwrt_plugin_need=1
if [ ! -f ${hiso_iso_part}/hiperiso/hiperiso_openwrt.xz ]; then
hiperiso_gui_console
echo -e "\n hiperiso_openwrt.xz not found. Please refer https://www.hiperiso.net/en/doc_openwrt.html.\n"
echo -e " 未找到 hiperiso_openwrt.xz 文件。请参考 https://www.hiperiso.net/cn/doc_openwrt.html\n"
echo -e "\n hiperiso_openwrt.xz not found. Please refer https://redbearos.org/hiperiso/en/doc_openwrt.html.\n"
echo -e " 未找到 hiperiso_openwrt.xz 文件。请参考 https://redbearos.org/hiperiso/cn/doc_openwrt.html\n"
echo -en "\n$VTLANG_ENTER_EXIT ..."
read vtInputKey
hiperiso_cli_console
@@ -2162,8 +2162,8 @@ function hiperiso_img_openwrt {
hiperiso_debug_pause
else
hiperiso_gui_console
echo -e "\n IMG file need processed. Please refer https://www.hiperiso.net/en/doc_openwrt.html.\n"
echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://www.hiperiso.net/cn/doc_openwrt.html\n"
echo -e "\n IMG file need processed. Please refer https://redbearos.org/hiperiso/en/doc_openwrt.html.\n"
echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://redbearos.org/hiperiso/cn/doc_openwrt.html\n"
echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
read vtInputKey
hiperiso_cli_console
@@ -2606,20 +2606,20 @@ function hiperiso_boot {
if [ "$grub_platform" = "pc" ]; then
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION BIOS www.hiperiso.net"
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION BIOS redbearos.org/hiperiso"
else
if [ "$grub_cpu" = "i386" ]; then
set HISO_EFI_ARCH=ia32
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION IA32 www.hiperiso.net"
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION IA32 redbearos.org/hiperiso"
elif [ "$grub_cpu" = "arm64" ]; then
set HISO_EFI_ARCH=aa64
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION AA64 www.hiperiso.net"
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION AA64 redbearos.org/hiperiso"
elif [ "$grub_cpu" = "mips64el" ]; then
set HISO_EFI_ARCH=mips
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION MIPS www.hiperiso.net"
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION MIPS redbearos.org/hiperiso"
else
set HISO_EFI_ARCH=x64
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION UEFI www.hiperiso.net"
set HISO_TEXT_MENU_VER="Hiperiso $HIPERISO_VERSION UEFI redbearos.org/hiperiso"
fi
fi
src/grub2/hiperiso.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso.h
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_browser.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_browser.c
*
* Copyright (c) 2022, longpanda <admin@hiperiso.net>
* Copyright (c) 2022, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_cmd.c
+2 -2
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_cmd.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -548,7 +548,7 @@ static int hiperiso_set_check_result(int ret, const char *msg)
grub_printf("This is NOT a standard Hiperiso device and is NOT supported (%d).\n", ret);
grub_printf("Error message: <%s>\n\n", msg);
grub_printf("You should follow the instructions in https://www.hiperiso.net to use Hiperiso.\n");
grub_printf("You should follow the instructions in https://redbearos.org/hiperiso to use Hiperiso.\n");
grub_refresh();
}
src/grub2/hiperiso_def.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_def.h
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_json.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_json.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_linux.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_linux.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_plugin.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_plugin.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_unix.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_unix.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_vhd.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_vhd.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/grub2/hiperiso_windows.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_windows.c
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_crc32.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* crc32.c ---- hiperiso crc32
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_define.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_define.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_disk.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_disk.c ---- hiperiso disk
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_disk.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_disk.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_json.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_json.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_json.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_json.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_log.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_log.c ---- hiperiso log
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_md5.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_md5.c ---- hiperiso md5
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_util.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_util.c ---- hiperiso util
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Core/hiperiso_util.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_util.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/GTK/hiperiso_gtk.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_gtk.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/GTK/hiperiso_gtk.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_gtk.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/GTK/refresh_icon_data.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* refresh_icon_data.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/GTK/secure_icon_data.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* secure_icon_data.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/GTK/window_icon_data.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* window_icon_data.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Include/Hiperiso2Disk.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* Hiperiso2Disk.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/QT/hiperiso_qt.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_qt.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/QT/hiperiso_qt_stub.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_qt_stub.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/QT/refresh_icon_data.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* refresh_icon_data.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/QT/secure_icon_data.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* secure_icon_data.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Web/hiperiso_http.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_http.c ---- hiperiso http
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/gui/Web/hiperiso_http.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_http.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/crc32.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisogpt.c ---- hiperiso gpt util
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/hisocli.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisocli.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/hisocli.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisocli.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/hisofat.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisofat.c ---- Parse fat file system
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/hisogpt.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisogpt.c ---- hiperiso gpt util
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisocli/partresize.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* partresize.c ---- hiperiso part resize util
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisofat/hisofat_linux.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisofat.c ---- Parse fat file system
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisogpt/crc32.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisogpt.c ---- hiperiso gpt util
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisogpt/hisogpt.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hisogpt.c ---- hiperiso gpt util
*
* Copyright (c) 2020, longpanda <admin@hiperiso.net>
* Copyright (c) 2020, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/hisolnk/crc32.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* crc32.c ----
*
* Copyright (c) 2022, longpanda <admin@hiperiso.net>
* Copyright (c) 2022, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/installer/Hiperiso2Disk.sh
+2 -2
View File
@@ -27,8 +27,8 @@ export PATH="$PWD/tool/$TOOLDIR:$PATH"
echo ''
echo '**********************************************'
echo " Hiperiso: $curver $TOOLDIR"
echo " longpanda admin@hiperiso.net"
echo " https://www.hiperiso.net"
echo " vasilito adminpupkin@gmail.com"
echo " https://redbearos.org/hiperiso"
echo '**********************************************'
echo ''
src/installer/tool/HiperisoWorker.sh
+15
View File
@@ -379,6 +379,21 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
hisocli partresize -s $DISK $part2_start_sector
fi
hisoinfo "copying hiperiso EFI binaries to data partition ..."
MOUNT_DIR="./tmp_hiso_mnt"
rm -rf "$MOUNT_DIR"
mkdir -p "$MOUNT_DIR"
if mount -t exfat ${PART1} "$MOUNT_DIR" 2>/dev/null; then
mkdir -p "$MOUNT_DIR/hiperiso"
cp -a ./hiperiso/. "$MOUNT_DIR/hiperiso/" 2>/dev/null
sync
umount "$MOUNT_DIR"
else
hisowarn "Could not mount ${PART1} to copy hiperiso binaries."
hisowarn "Manually copy ./hiperiso/* to the data partition root."
fi
rm -rf "$MOUNT_DIR"
echo ""
hisoinfo "Install Hiperiso to $DISK successfully finished."
sync
src/plugson/src/Core/hiperiso_crc32.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* crc32.c ---- hiperiso crc32
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_define.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_define.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_disk.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_disk.c ---- hiperiso disk
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_disk.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_disk.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_disk_linux.c
+3 -3
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_disk.c ---- hiperiso disk
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -414,7 +414,7 @@ static int fatlib_get_hiperiso_version(char *verbuf, int bufsize)
return rc;
}
/* <BEGIN>: Deleted by longpanda, 20211028 PN:XX LABEL:XX */
/* <BEGIN>: Deleted by vasilito, 20211028 PN:XX LABEL:XX */
#if 0
int hiperiso_get_hiso_data(hiperiso_disk *info, int *ppartstyle)
{
@@ -578,7 +578,7 @@ end:
return rc;
}
#endif /* #if 0 */
/* <END> : Deleted by longpanda, 20211028 PN:XX LABEL:XX */
/* <END> : Deleted by vasilito, 20211028 PN:XX LABEL:XX */
int hiperiso_get_disk_info(char **argv)
src/plugson/src/Core/hiperiso_disk_windows.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_disk.c ---- hiperiso disk
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_json.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_json.c
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_json.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_json.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_log.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_log.c ---- hiperiso log
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_md5.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_md5.c ---- hiperiso md5
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_utf.c
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_utf.c ---- hiperiso utf
* Copyright (c) 2022, Davipb https://github.com/Davipb/utf8-utf16-converter
* Copyright (c) 2022, longpanda <admin@hiperiso.net>
* Copyright (c) 2022, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_util.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_util.c ---- hiperiso util
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_util.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_util.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_util_linux.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_util_linux.c ---- hiperiso util
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Core/hiperiso_util_windows.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_util.c ---- hiperiso util
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Web/hiperiso_http.c
+1 -1
View File
@@ -1,6 +1,6 @@
/******************************************************************************
* hiperiso_http.c ---- hiperiso http
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/src/Web/hiperiso_http.h
+1 -1
View File
@@ -1,7 +1,7 @@
/******************************************************************************
* hiperiso_http.h
*
* Copyright (c) 2021, longpanda <admin@hiperiso.net>
* Copyright (c) 2021, vasilito <adminpupkin@gmail.com> (originally Ventoy by longpanda)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
src/plugson/www/index.html
+2 -2
View File
@@ -85,7 +85,7 @@
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="https://www.hiperiso.net" target="_blank" >
<a href="https://redbearos.org/hiperiso" target="_blank" >
<span class="fa fa-link"></span>&nbsp;
<span class="hidden-xs">Hiperiso</span>
</a>
@@ -762,7 +762,7 @@
<div class="pull-right hidden-xs">
<b id="plugson_build_date">20260625 19:36:29</b>
</div>
<strong><a href="https://www.hiperiso.net" target="_blank">https://www.hiperiso.net</a></strong>
<strong><a href="https://redbearos.org/hiperiso" target="_blank">https://redbearos.org/hiperiso</a></strong>
</footer>
<!-- Control Sidebar -->
src/plugson/www/plugson_auto_install.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_autoinstall.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_autoinstall.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_auto_memdisk.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_automemdisk.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_automemdisk.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_conf_replace.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_bootconf_replace.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_bootconf_replace.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_control.html
+1 -1
View File
@@ -15,7 +15,7 @@
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/cn/plugin_control.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/cn/plugin_control.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_donation.html
+1 -1
View File
@@ -28,7 +28,7 @@
<p style="text-align:left;font-size:16px;">
PayPal and Bitcoin are avaliable for donation. You can chose any of them. <br/><br/>
<span style="font-weight:bold;">PayPal Link&nbsp;&nbsp;</span><a target="_blank" href="https://www.paypal.me/hiperiso">https://www.paypal.me/hiperiso</a><br/><br/>
<span style="font-weight:bold;">PayPal Account&nbsp;&nbsp;<span style="color:blue; font-weight:bold;"> admin@hiperiso.net</span></span><br/><br/>
<span style="font-weight:bold;">PayPal Account&nbsp;&nbsp;<span style="color:blue; font-weight:bold;"> adminpupkin@gmail.com</span></span><br/><br/>
<span style="font-weight:bold;">Bitcoin Address&nbsp;</span> <span style="color:blue; font-weight:bold;"> 19mZDWzZgzkHCi9YX9H3fYCUuCHq3W6wfT </span><br/>
</p>
</div>
src/plugson/www/plugson_dud.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_dud.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_dud.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_image_list.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_imagelist.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_imagelist.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_injection.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_injection.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_injection.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_menu_alias.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menualias.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_menualias.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_menu_class.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menuclass.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_menuclass.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_menu_tip.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_menutip.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_menutip.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_password.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_password.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_password.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_persistence.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/en/plugin_persistence.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/en/plugin_persistence.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
src/plugson/www/plugson_theme.html
+3 -3
View File
@@ -8,7 +8,7 @@
<button id="id_btn_reset" class="btn btn-sm btn-danger btn-del"><i class="fa fa-trash"></i><span id="id_btn_span_reset">Reset</span></button>
</div>
<div class="col-sm-2" style="font-size:16px;padding-top:8px;">
<a id="id_a_official_doc" target="_blank" href="https://www.hiperiso.net/cn/plugin_theme.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
<a id="id_a_official_doc" target="_blank" href="https://redbearos.org/hiperiso/cn/plugin_theme.html"><span class="fa fa-link"></span><span id="id_span_official_doc">官网文档</span></a>
</div>
</div>
<legend></legend>
@@ -99,7 +99,7 @@
<code style="font-weight: bold;">0</code> 不过滤 &nbsp;&nbsp;
<code style="font-weight: bold;">1</code> 过滤 <br/>
注意，这个选项必须在上面设置了多个主题配置文件，同时 "默认" 设置为 “随机选择” 时才有效，其他情况下均无效。<br/>
关于这个选项的详细解释，请参考 <a href="https://www.hiperiso.net/cn/plugin_theme.html#hiso_theme_res_fit">resolution_fit 选项说明</a>
关于这个选项的详细解释，请参考 <a href="https://redbearos.org/hiperiso/cn/plugin_theme.html#hiso_theme_res_fit">resolution_fit 选项说明</a>
</td>
</tr>
<tr id="tr_title_desc_en">
@@ -108,7 +108,7 @@
Filter by current resolution when you set more than one themes. &nbsp;&nbsp;
<code style="font-weight: bold;">0</code> No filter &nbsp;&nbsp
<code style="font-weight: bold;">1</code> Filter <br/>
You can refer <a href="https://www.hiperiso.net/en/plugin_theme.html#hiso_theme_res_fit">About resolution_fit</a> for details about this option.
You can refer <a href="https://redbearos.org/hiperiso/en/plugin_theme.html#hiso_theme_res_fit">About resolution_fit</a> for details about this option.
</td>
</tr>
</table>