X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ebaa4d954aa0b3d70f14b2fd6fec63df1599b8ce..8632e565617ce5454729ebaae9eed17fe872513b:/INSTALL/tool/VentoyWorker.sh diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh index d353c45..adf2d0e 100644 --- a/INSTALL/tool/VentoyWorker.sh +++ b/INSTALL/tool/VentoyWorker.sh @@ -15,12 +15,12 @@ print_usage() { echo ' -r SIZE_MB preserve some space at the bottom of the disk (only for install)' echo ' -s/-S enable/disable secure boot support (default is disabled)' echo ' -g use GPT partition style, default is MBR (only for install)' - echo ' -L Label of the 1st exfat partition (default is ventoy)' + echo ' -L Label of the 1st exfat partition (default is Ventoy)' echo '' } -VTNEW_LABEL='ventoy' +VTNEW_LABEL='Ventoy' RESERVE_SIZE_MB=0 while [ -n "$1" ]; do if [ "$1" = "-i" ]; then @@ -121,17 +121,11 @@ if [ "$MODE" = "list" ]; then echo "Disk Partition Style : MBR" fi - vtPART2=$(get_disk_part_name $DISK 2) - rm -rf ./tmpmntp2 && mkdir ./tmpmntp2 - mount $vtPART2 ./tmpmntp2 > /dev/null 2>&1 - - if [ -e ./tmpmntp2/EFI/BOOT/MokManager.efi ]; then + if check_disk_secure_boot $DISK; then echo "Secure Boot Support : YES" else echo "Secure Boot Support : NO" fi - umount ./tmpmntp2 > /dev/null 2>&1 - rm -rf ./tmpmntp2 else echo "Ventoy Version: NA" fi @@ -422,7 +416,8 @@ else dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin if [ "$PART1_TYPE" = "EE" ]; then - vtdebug "This is GPT partition style ..." + vtdebug "This is GPT partition style ..." + echo -en '\x22' | dd status=none of=$DISK conv=fsync bs=1 count=1 seek=92 xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2014 seek=34 echo -en '\x23' | dd of=$DISK conv=fsync bs=1 count=1 seek=17908 status=none else