mirror of
https://github.com/ventoy/Ventoy.git
synced 2025-01-12 15:33:25 -05:00
1.0.63 release
This commit is contained in:
parent
4a44a82840
commit
b9b6852631
2
.github/ISSUE_TEMPLATE/issue_template.yml
vendored
2
.github/ISSUE_TEMPLATE/issue_template.yml
vendored
@ -21,7 +21,7 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
label: Ventoy Version
|
label: Ventoy Version
|
||||||
description: What version of ventoy are you running?
|
description: What version of ventoy are you running?
|
||||||
placeholder: 1.0.62
|
placeholder: 1.0.63
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: dropdown
|
- type: dropdown
|
||||||
|
@ -166,6 +166,8 @@ function vt_check_compatible_pe {
|
|||||||
function vt_check_compatible_linux {
|
function vt_check_compatible_linux {
|
||||||
if vt_str_begin "$vt_volume_id" "embootkit"; then
|
if vt_str_begin "$vt_volume_id" "embootkit"; then
|
||||||
set ventoy_compatible=YES
|
set ventoy_compatible=YES
|
||||||
|
elif [ -e "$1/casper/tinycore.gz" ]; then
|
||||||
|
set ventoy_compatible=YES
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return
|
return
|
||||||
@ -2020,7 +2022,7 @@ function img_unsupport_menuentry {
|
|||||||
#############################################################
|
#############################################################
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
set VENTOY_VERSION="1.0.62"
|
set VENTOY_VERSION="1.0.63"
|
||||||
|
|
||||||
#ACPI not compatible with Window7/8, so disable by default
|
#ACPI not compatible with Window7/8, so disable by default
|
||||||
set VTOY_PARAM_NO_ACPI=1
|
set VTOY_PARAM_NO_ACPI=1
|
||||||
|
@ -291,8 +291,23 @@ if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
|
|||||||
dd status=none conv=fsync if=/dev/zero of=$DISK bs=512 count=32 seek=$part2_start_sector
|
dd status=none conv=fsync if=/dev/zero of=$DISK bs=512 count=32 seek=$part2_start_sector
|
||||||
|
|
||||||
#format part1
|
#format part1
|
||||||
vtinfo "Format partition 1 ..."
|
wait_and_create_part ${PART1} ${PART2}
|
||||||
mkexfatfs -n "$VTNEW_LABEL" -s $cluster_sectors ${PART1}
|
if [ -b ${PART1} ]; then
|
||||||
|
vtinfo "Format partition 1 ${PART1} ..."
|
||||||
|
mkexfatfs -n "$VTNEW_LABEL" -s $cluster_sectors ${PART1}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "mkexfatfs failed, now retry..."
|
||||||
|
mkexfatfs -n "$VTNEW_LABEL" -s $cluster_sectors ${PART1}
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "######### mkexfatfs failed, exit ########"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "mkexfatfs success"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
vterr "${PART1} NOT exist"
|
||||||
|
fi
|
||||||
|
|
||||||
vtinfo "writing data to disk ..."
|
vtinfo "writing data to disk ..."
|
||||||
dd status=none conv=fsync if=./boot/boot.img of=$DISK bs=1 count=446
|
dd status=none conv=fsync if=./boot/boot.img of=$DISK bs=1 count=446
|
||||||
|
@ -206,6 +206,48 @@ get_disk_ventoy_version() {
|
|||||||
ventoy_false
|
ventoy_false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wait_and_create_part() {
|
||||||
|
vPART1=$1
|
||||||
|
vPART2=$2
|
||||||
|
echo 'Wait for partitions ...'
|
||||||
|
for i in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
if ls -l $vPART1 2>/dev/null | grep -q '^b'; then
|
||||||
|
if ls -l $vPART2 2>/dev/null | grep -q '^b'; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Wait for $vPART1/$vPART2 ..."
|
||||||
|
sleep 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if ls -l $vPART1 2>/dev/null | grep -q '^b'; then
|
||||||
|
echo "$vPART1 exist OK"
|
||||||
|
else
|
||||||
|
MajorMinor=$(sed "s/:/ /" /sys/class/block/${vPART1#/dev/}/dev)
|
||||||
|
echo "mknod -m 0660 $vPART1 b $MajorMinor ..."
|
||||||
|
mknod -m 0660 $vPART1 b $MajorMinor
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ls -l $vPART2 2>/dev/null | grep -q '^b'; then
|
||||||
|
echo "$vPART2 exist OK"
|
||||||
|
else
|
||||||
|
MajorMinor=$(sed "s/:/ /" /sys/class/block/${vPART2#/dev/}/dev)
|
||||||
|
echo "mknod -m 0660 $vPART2 b $MajorMinor ..."
|
||||||
|
mknod -m 0660 $vPART2 b $MajorMinor
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ls -l $vPART1 2>/dev/null | grep -q '^b'; then
|
||||||
|
if ls -l $vPART2 2>/dev/null | grep -q '^b'; then
|
||||||
|
echo "partition exist OK"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "[FAIL] $vPART1/$vPART2 does not exist"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
format_ventoy_disk_mbr() {
|
format_ventoy_disk_mbr() {
|
||||||
reserve_mb=$1
|
reserve_mb=$1
|
||||||
DISK=$2
|
DISK=$2
|
||||||
|
Loading…
Reference in New Issue
Block a user