mirror of
https://github.com/ventoy/Ventoy.git
synced 2025-08-28 00:11:15 +00:00
1.0.04 release
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -119,7 +119,7 @@ if [ "$MODE" = "install" ]; then
|
||||
|
||||
#Print disk info
|
||||
echo "Disk : $DISK"
|
||||
parted $DISK p 2>&1 | grep Model
|
||||
parted -s $DISK p 2>&1 | grep Model
|
||||
echo "Size : $disk_size_gb GB"
|
||||
echo ''
|
||||
|
||||
@@ -176,13 +176,17 @@ if [ "$MODE" = "install" ]; then
|
||||
|
||||
$cmd -n ventoy -s $cluster_sectors ${DISK}1
|
||||
|
||||
dd status=none if=./boot/boot.img of=$DISK bs=1 count=446
|
||||
chmod +x ./tool/vtoy_gen_uuid
|
||||
|
||||
dd status=none if=./boot/boot.img of=$DISK bs=1 count=446
|
||||
./tool/xzcat ./boot/core.img.xz | dd status=none of=$DISK bs=512 count=2047 seek=1
|
||||
./tool/xzcat ./ventoy/ventoy.disk.img.xz | dd status=none of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start_sector
|
||||
|
||||
|
||||
chmod +x ./tool/vtoy_gen_uuid
|
||||
|
||||
#disk uuid
|
||||
./tool/vtoy_gen_uuid | dd status=none of=${DISK} seek=384 bs=1 count=16
|
||||
|
||||
#disk signature
|
||||
./tool/vtoy_gen_uuid | dd status=none of=${DISK} skip=12 seek=440 bs=1 count=4
|
||||
|
||||
sync
|
||||
|
||||
@@ -216,7 +220,7 @@ else
|
||||
|
||||
PART2=$(get_disk_part_name $DISK 2)
|
||||
|
||||
dd status=none if=./boot/boot.img of=$DISK bs=1 count=446
|
||||
dd status=none if=./boot/boot.img of=$DISK bs=1 count=440
|
||||
|
||||
./tool/xzcat ./boot/core.img.xz | dd status=none of=$DISK bs=512 count=2047 seek=1
|
||||
|
||||
|
@@ -146,6 +146,9 @@ function uefi_iso_menu_func {
|
||||
|
||||
if [ -n "$vtisouefi" ]; then
|
||||
set LoadIsoEfiDriver=on
|
||||
unset vtisouefi
|
||||
elif [ -n "$VTOY_ISO_UEFI_DRV" ]; then
|
||||
set LoadIsoEfiDriver=on
|
||||
else
|
||||
unset LoadIsoEfiDriver
|
||||
fi
|
||||
@@ -161,7 +164,14 @@ function uefi_iso_menu_func {
|
||||
loopback loop ${1}${chosen_path}
|
||||
get_os_type (loop)
|
||||
|
||||
vt_check_compatible (loop)
|
||||
if [ -n "$vtcompat" ]; then
|
||||
set ventoy_compatible=YES
|
||||
unset vtcompat
|
||||
elif [ -n "$VTOY_ISO_RAW" ]; then
|
||||
set ventoy_compatible=YES
|
||||
else
|
||||
vt_check_compatible (loop)
|
||||
fi
|
||||
|
||||
vt_img_sector ${1}${chosen_path}
|
||||
|
||||
@@ -178,6 +188,21 @@ function uefi_iso_menu_func {
|
||||
terminal_output gfxterm
|
||||
}
|
||||
|
||||
function uefi_iso_memdisk {
|
||||
vt_chosen_img_path chosen_path
|
||||
|
||||
echo 'Loading ISO file to memory ...'
|
||||
vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
|
||||
|
||||
terminal_output console
|
||||
chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
|
||||
boot
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function legacy_windows_menu_func {
|
||||
vt_windows_reset
|
||||
|
||||
@@ -280,7 +305,14 @@ function legacy_iso_menu_func {
|
||||
|
||||
get_os_type (loop)
|
||||
|
||||
vt_check_compatible (loop)
|
||||
if [ -n "$vtcompat" ]; then
|
||||
set ventoy_compatible=YES
|
||||
unset vtcompat
|
||||
elif [ -n "$VTOY_ISO_RAW" ]; then
|
||||
set ventoy_compatible=YES
|
||||
else
|
||||
vt_check_compatible (loop)
|
||||
fi
|
||||
|
||||
vt_img_sector ${1}${chosen_path}
|
||||
|
||||
@@ -294,8 +326,14 @@ function legacy_iso_menu_func {
|
||||
fi
|
||||
}
|
||||
|
||||
function legacy_iso_memdisk {
|
||||
vt_chosen_img_path chosen_path
|
||||
|
||||
|
||||
linux16 $vtoy_path/memdisk iso raw
|
||||
echo "Loading ISO file to memory ..."
|
||||
initrd16 ${1}${chosen_path}
|
||||
boot
|
||||
}
|
||||
|
||||
|
||||
#############################################################
|
||||
@@ -306,11 +344,15 @@ function legacy_iso_menu_func {
|
||||
#############################################################
|
||||
#############################################################
|
||||
|
||||
set VENTOY_VERSION="1.0.02"
|
||||
set VENTOY_VERSION="1.0.04"
|
||||
|
||||
#disable timeout
|
||||
unset timeout
|
||||
|
||||
set VTOY_MEM_DISK_STR="MEMDISK"
|
||||
set VTOY_ISO_RAW_STR="ISO RAW"
|
||||
set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
|
||||
|
||||
vt_device $root vtoy_dev
|
||||
|
||||
if [ "$vtoy_dev" = "tftp" ]; then
|
||||
@@ -357,9 +399,17 @@ if vt_cmp $ventoy_img_count ne 0; then
|
||||
vt_img_name $imgid img_name
|
||||
menuentry "$img_name" {
|
||||
if [ "$grub_platform" = "pc" ]; then
|
||||
legacy_iso_menu_func $iso_path
|
||||
if [ -n "$VTOY_MEM_DISK" ]; then
|
||||
legacy_iso_memdisk $iso_path
|
||||
else
|
||||
legacy_iso_menu_func $iso_path
|
||||
fi
|
||||
else
|
||||
uefi_iso_menu_func $iso_path
|
||||
if [ -n "$VTOY_MEM_DISK" ]; then
|
||||
uefi_iso_memdisk $iso_path
|
||||
else
|
||||
uefi_iso_menu_func $iso_path
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
Binary file not shown.
@@ -48,3 +48,31 @@ terminal-box: "terminal_box_*.png"
|
||||
bar_style = "*"
|
||||
highlight_style = "*"
|
||||
}
|
||||
|
||||
|
||||
+ hbox{
|
||||
left = 90%
|
||||
top = 5
|
||||
width = 10%
|
||||
height = 25
|
||||
+ label {text = "@VTOY_MEM_DISK@" color = "red" align = "left"}
|
||||
}
|
||||
|
||||
|
||||
+ hbox{
|
||||
left = 90%
|
||||
top = 30
|
||||
width = 10%
|
||||
height = 25
|
||||
+ label {text = "@VTOY_ISO_RAW@" color = "red" align = "left"}
|
||||
}
|
||||
|
||||
|
||||
+ hbox{
|
||||
left = 90%
|
||||
top = 55
|
||||
width = 10%
|
||||
height = 25
|
||||
+ label {text = "@VTOY_ISO_UEFI_DRV@" color = "red" align = "left"}
|
||||
}
|
||||
|
||||
|
Binary file not shown.
BIN
INSTALL/ventoy/memdisk
Normal file
BIN
INSTALL/ventoy/memdisk
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user