X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/4cb9134e5c8be0dce3fd74ecffc08ff5cb4ffe9f..e8d17f9bb1070fe612f7fffc1f2b020f07e06a1c:/INSTALL/tool/VentoyWorker.sh?ds=sidebyside diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh index 6f20a08..c74d3c9 100644 --- a/INSTALL/tool/VentoyWorker.sh +++ b/INSTALL/tool/VentoyWorker.sh @@ -3,6 +3,7 @@ . ./tool/ventoy_lib.sh print_usage() { + echo 'Usage: Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX' echo ' CMD:' echo ' -i install ventoy to sdX (fail if disk already installed with ventoy)' @@ -13,9 +14,12 @@ print_usage() { echo ' -r SIZE_MB preserve some space at the bottom of the disk (only for install)' echo ' -s enable 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 '' } + +VTNEW_LABEL='ventoy' RESERVE_SIZE_MB=0 while [ -n "$1" ]; do if [ "$1" = "-i" ]; then @@ -29,10 +33,18 @@ while [ -n "$1" ]; do SECUREBOOT="YES" elif [ "$1" = "-g" ]; then VTGPT="YES" + elif [ "$1" = "-L" ]; then + shift + VTNEW_LABEL=$1 elif [ "$1" = "-r" ]; then RESERVE_SPACE="YES" shift RESERVE_SIZE_MB=$1 + elif [ "$1" = "-V" ] || [ "$1" = "--version" ]; then + exit 0 + elif [ "$1" == "-h" ] || [ "$1" = "--help" ]; then + print_usage + exit 0 else if ! [ -b "$1" ]; then vterr "$1 is NOT a valid device" @@ -56,7 +68,11 @@ if ! [ -b "$DISK" ]; then fi if [ -e /sys/class/block/${DISK#/dev/}/start ]; then - vterr "$DISK is a partition, please use the whole disk" + vterr "$DISK is a partition, please use the whole disk." + echo "For example:" + vterr " sudo sh Ventoy2Disk.sh -i /dev/sdX1 <=== This is wrong" + vtinfo " sudo sh Ventoy2Disk.sh -i /dev/sdX <=== This is right" + echo "" exit 1 fi @@ -69,6 +85,7 @@ if [ -n "$RESERVE_SPACE" ]; then fi fi +#check access if dd if="$DISK" of=/dev/null bs=1 count=1 >/dev/null 2>&1; then vtdebug "root permission check ok ..." else @@ -79,33 +96,32 @@ fi vtdebug "MODE=$MODE FORCE=$FORCE RESERVE_SPACE=$RESERVE_SPACE RESERVE_SIZE_MB=$RESERVE_SIZE_MB" -if ! check_tool_work_ok; then +#check tools +if check_tool_work_ok; then + vtdebug "check tool work ok" +else vterr "Some tools can not run in current system. Please check log.txt for detail." exit 1 fi +#check mountpoint grep "^$DISK" /proc/mounts | while read mtline; do mtpnt=$(echo $mtline | awk '{print $2}') vtdebug "Trying to umount $mtpnt ..." umount $mtpnt >/dev/null 2>&1 done -if swapon -s | grep -q "^${DISK}[0-9]"; then - swapon -s | grep "^${DISK}[0-9]" | awk '{print $1}' | while read line; do - vtdebug "Trying to swapoff $line ..." - swapoff $line - done -fi - - if grep "$DISK" /proc/mounts; then vterr "$DISK is already mounted, please umount it first!" exit 1 fi -if swapon -s | grep -q "^${DISK}[0-9]"; then - vterr "$DISK is used as swap, please swapoff it first!" - exit 1 +#check swap partition +if swapon --help 2>&1 | grep -q '^ \-s,'; then + if swapon -s | grep -q "^${DISK}[0-9]"; then + vterr "$DISK is used as swap, please swapoff it first!" + exit 1 + fi fi @@ -116,7 +132,8 @@ if [ "$MODE" = "install" ]; then if parted -v > /dev/null 2>&1; then PARTTOOL='parted' else - vterr "parted is not found in the sysstem, Ventoy can't create new partition." + vterr "parted is not found in the system, Ventoy can't create new partitions without it." + vterr "You should install \"GNU parted\" first." exit 1 fi else @@ -125,7 +142,7 @@ if [ "$MODE" = "install" ]; then elif fdisk -v >/dev/null 2>&1; then PARTTOOL='fdisk' else - vterr "Both parted and fdisk are not found in the sysstem, Ventoy can't create new partition." + vterr "Both parted and fdisk are not found in the system, Ventoy can't create new partitions." exit 1 fi fi @@ -144,7 +161,7 @@ if [ "$MODE" = "install" ]; then disk_sector_num=$(cat /sys/block/${DISK#/dev/}/size) disk_size_gb=$(expr $disk_sector_num / 2097152) - if [ $disk_sector_num -gt 4294967296 ]; then + if [ $disk_sector_num -gt 4294967296 ] && [ -z "$VTGPT" ]; then vterr "$DISK is over 2TB size, MBR will not work on it." exit 1 fi @@ -180,7 +197,7 @@ if [ "$MODE" = "install" ]; then vtwarn "All the data on the disk $DISK will be lost!!!" echo "" - read -p 'Continue? (y/n)' Answer + read -p 'Continue? (y/n) ' Answer if [ "$Answer" != "y" ]; then if [ "$Answer" != "Y" ]; then exit 0 @@ -189,14 +206,13 @@ if [ "$MODE" = "install" ]; then echo "" vtwarn "All the data on the disk $DISK will be lost!!!" - read -p 'Double-check. Continue? (y/n)' Answer + read -p 'Double-check. Continue? (y/n) ' Answer if [ "$Answer" != "y" ]; then if [ "$Answer" != "Y" ]; then exit 0 fi fi - if [ $disk_sector_num -le $VENTOY_SECTOR_NUM ]; then vterr "No enough space in disk $DISK" exit 1 @@ -234,7 +250,10 @@ if [ "$MODE" = "install" ]; then cluster_sectors=64 fi - $cmd -n ventoy -s $cluster_sectors ${DISK}1 + PART1=$(get_disk_part_name $DISK 1) + PART2=$(get_disk_part_name $DISK 2) + + $cmd -n "$VTNEW_LABEL" -s $cluster_sectors ${PART1} vtinfo "writing data to disk ..." @@ -242,13 +261,13 @@ if [ "$MODE" = "install" ]; then if [ -n "$VTGPT" ]; then echo -en '\x22' | dd status=none of=$DISK conv=fsync bs=1 count=1 seek=92 - ./tool/xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2014 seek=34 + 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 - ./tool/xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1 + xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1 fi - ./tool/xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start_sector + xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start_sector #disk uuid ./tool/vtoy_gen_uuid | dd status=none conv=fsync of=${DISK} seek=384 bs=1 count=16 @@ -262,7 +281,7 @@ if [ "$MODE" = "install" ]; then vtinfo "esp partition processing ..." sleep 1 - mtpnt=$(grep "^${DISK}2" /proc/mounts | awk '{print $2}') + mtpnt=$(grep "^${PART2}" /proc/mounts | awk '{print $2}') if [ -n "$mtpnt" ]; then umount $mtpnt >/dev/null 2>&1 fi @@ -272,12 +291,12 @@ if [ "$MODE" = "install" ]; then vtdebug "mounting part2 ...." for tt in 1 2 3; do - if mount ${DISK}2 ./tmp_mnt; then + if mount ${PART2} ./tmp_mnt; then vtdebug "mounting part2 success" break fi - mtpnt=$(grep "^${DISK}2" /proc/mounts | awk '{print $2}') + mtpnt=$(grep "^${PART2}" /proc/mounts | awk '{print $2}') if [ -n "$mtpnt" ]; then umount $mtpnt >/dev/null 2>&1 fi @@ -330,7 +349,7 @@ else if [ "$PART1_TYPE" = "EE" ]; then vtdebug "This is GPT partition style ..." - ./tool/xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2014 seek=34 + 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 vtdebug "This is MBR partition style ..." @@ -345,10 +364,10 @@ else echo -en '\x80' | dd of=$DISK conv=fsync bs=1 count=1 seek=446 status=none echo -en '\x00' | dd of=$DISK conv=fsync bs=1 count=1 seek=462 status=none fi - ./tool/xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1 + xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1 fi - ./tool/xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start + xzcat ./ventoy/ventoy.disk.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=$VENTOY_SECTOR_NUM seek=$part2_start sync @@ -357,7 +376,7 @@ else vtdebug "mounting part2 ...." for tt in 1 2 3; do - if mount ${DISK}2 ./tmp_mnt; then + if mount ${PART2} ./tmp_mnt; then vtdebug "mounting part2 success" break fi