X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/1f49265f29459295bc1b66c53da3de9e99a9370e..bd8aebf166bd9a7a5f2fc0f54baf2aff3bea74cd:/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh index a22314f..7dad4b4 100644 --- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh +++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh @@ -31,6 +31,7 @@ HEAD=$BUSYBOX_PATH/head VTOY_DM_PATH=/dev/mapper/ventoy VTOY_DEBUG_LEVEL=$($BUSYBOX_PATH/hexdump -n 1 -s 450 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param) VTOY_LINUX_REMOUNT=$($BUSYBOX_PATH/hexdump -n 1 -s 454 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param) +VTOY_VLNK_BOOT=$($BUSYBOX_PATH/hexdump -n 1 -s 455 -e '1/1 "%02x"' $VTOY_PATH/ventoy_os_param) if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then if [ -e /dev/console ]; then @@ -63,14 +64,24 @@ is_ventoy_hook_finished() { set_ventoy_hook_finish() { echo 'Y' > $VTOY_PATH/hook_finish + + if [ -f /ventoy/ventoy_iso_part_dm_cmd ]; then + echo "### create iso part raw dm" >> $VTLOG + $BUSYBOX_PATH/sh /ventoy/ventoy_iso_part_dm_cmd >>$VTLOG 2>&1 + $BUSYBOX_PATH/rm -f /ventoy/ventoy_iso_part_dm_cmd + fi } -get_ventoy_disk_name() { - line=$($VTOY_PATH/tool/vtoydump -f /ventoy/ventoy_os_param) - if [ $? -eq 0 ]; then - echo ${line%%#*} - else - echo "unknown" +get_ventoy_disk_name() { + if [ "$VTOY_VLNK_BOOT" = "01" ]; then + $VTOY_PATH/tool/vtoydump -t /ventoy/ventoy_os_param + else + line=$($VTOY_PATH/tool/vtoydump -f /ventoy/ventoy_os_param) + if [ $? -eq 0 ]; then + echo ${line%%#*} + else + echo "unknown" + fi fi } @@ -121,14 +132,6 @@ check_usb_disk_ready() { [ -e "${vtpart2}" ] } -is_ventoy_disk() { - if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$1"; then - $BUSYBOX_PATH/true - else - $BUSYBOX_PATH/false - fi -} - not_ventoy_disk() { if echo $1 | $EGREP -q "nvme.*p$|mmc.*p$|nbd.*p$"; then vtDiskName=${1:0:-1} @@ -136,10 +139,15 @@ not_ventoy_disk() { vtDiskName=$1 fi - if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$vtDiskName"; then - $BUSYBOX_PATH/false + if [ "$VTOY_VLNK_BOOT" = "01" ]; then + vtVtoyDisk=$($VTOY_PATH/tool/vtoydump -t $VTOY_PATH/ventoy_os_param) + [ "$vtVtoyDisk" != "/dev/$vtDiskName" ] else - $BUSYBOX_PATH/true + if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$vtDiskName"; then + $BUSYBOX_PATH/false + else + $BUSYBOX_PATH/true + fi fi } @@ -207,11 +215,20 @@ ventoy_check_dm_module() { vtlog "modprobe failed, now try to insmod ko..." $FIND /lib/modules/ -name "dm-mod.ko*" | while read vtline; do - vtlog "insmode $vtline " + vtlog "insmod $vtline " $BUSYBOX_PATH/insmod $vtline >>$VTLOG 2>&1 + if [ $? -eq 0 ]; then + vtlog "insmod success" + else + vtlog "insmod failed, try decompress" + if echo $vtline | $GREP -q "\.zst"; then + $VTOY_PATH/tool/zstdcat $vtline > $VTOY_PATH/extract_dm_mod.ko + $BUSYBOX_PATH/insmod $VTOY_PATH/extract_dm_mod.ko >>$VTLOG 2>&1 + fi + fi done fi - + if $GREP -q 'device-mapper' /proc/devices; then vtlog "device-mapper found in /proc/devices after retry" $BUSYBOX_PATH/true; return @@ -221,124 +238,6 @@ ventoy_check_dm_module() { fi } -ventoy_need_dm_patch() { - if [ "$VTOY_LINUX_REMOUNT" != "01" ]; then - $BUSYBOX_PATH/false; return - fi - - if $GREP -q 'device-mapper' /proc/devices; then - : - else - $BUSYBOX_PATH/false; return - fi - - if $GREP -q 'dm_patch' /proc/modules; then - $BUSYBOX_PATH/false; return - fi - - vtMajorVer=$($BUSYBOX_PATH/uname -r | $AWK -F. '{print $1}') - vtMinorVer=$($BUSYBOX_PATH/uname -r | $AWK -F. '{print $2}') - - if [ $vtMajorVer -lt 3 ]; then - $BUSYBOX_PATH/false; return - elif [ $vtMajorVer -eq 3 -a $vtMinorVer -lt 10 ]; then - $BUSYBOX_PATH/false; return - fi - - - $BUSYBOX_PATH/true -} - -ventoy_dm_patch() { - vtMType=$($BUSYBOX_PATH/uname -m) - - vtlog "######### ventoy_dm_patch ############" - - if echo $vtMType | $EGREP -i -q "x86.64|amd64"; then - vtKoName=dm_patch_64.ko - else - vtlog "unsupported machine type $vtMType" - return - fi - - if [ -f $VTOY_PATH/tool/$vtKoName ]; then - vtlog "/ventoy/tool/$vtKoName exist OK" - else - vtlog "/ventoy/tool/$vtKoName NOT exist" - return - fi - - $CAT /proc/kallsyms | $BUSYBOX_PATH/sort > $VTOY_PATH/kallsyms - - vtLine=$($VTOY_PATH/tool/vtoyksym dm_get_table_device $VTOY_PATH/kallsyms) - get_addr=$(echo $vtLine | $AWK '{print $1}') - get_size=$(echo $vtLine | $AWK '{print $2}') - - vtLine=$($VTOY_PATH/tool/vtoyksym dm_put_table_device $VTOY_PATH/kallsyms) - put_addr=$(echo $vtLine | $AWK '{print $1}') - put_size=$(echo $vtLine | $AWK '{print $2}') - - ro_addr=$($GREP ' set_memory_ro$' /proc/kallsyms | $AWK '{print $1}') - rw_addr=$($GREP ' set_memory_rw$' /proc/kallsyms | $AWK '{print $1}') - kprobe_reg_addr=$($GREP ' register_kprobe$' /proc/kallsyms | $AWK '{print $1}') - kprobe_unreg_addr=$($GREP ' unregister_kprobe$' /proc/kallsyms | $AWK '{print $1}') - - if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then - printk_addr=$($GREP ' printk$' /proc/kallsyms | $AWK '{print $1}') - vtDebug="-v" - else - printk_addr=0 - fi - - #printk_addr=$($GREP ' printk$' /proc/kallsyms | $AWK '{print $1}') - #vtDebug="-v" - - vtlog get_addr=$get_addr get_size=$get_size - vtlog put_addr=$put_addr put_size=$put_size - vtlog kprobe_reg_addr=$kprobe_reg_addr kprobe_unreg_addr=$kprobe_unreg_addr - vtlog ro_addr=$ro_addr rw_addr=$rw_addr printk_addr=$printk_addr - - if [ "$get_addr" = "0" -o "$put_addr" = "0" ]; then - vtlog "Invalid symbol address" - return - fi - if [ "$ro_addr" = "0" -o "$rw_addr" = "0" ]; then - vtlog "Invalid symbol address" - return - fi - - - vtKv=$($BUSYBOX_PATH/uname -r) - vtModPath=$($FIND /lib/modules/$vtKv/kernel/fs/ -name "*.ko*" | $HEAD -n1) - vtModName=$($BUSYBOX_PATH/basename $vtModPath) - - vtlog "template module is $vtModPath $vtModName" - - if echo $vtModPath | $GREP -q "[.]ko$"; then - $BUSYBOX_PATH/cp -a $vtModPath $VTOY_PATH/$vtModName - elif echo $vtModPath | $GREP -q "[.]ko[.]xz$"; then - $BUSYBOX_PATH/xzcat $vtModPath > $VTOY_PATH/$vtModName - elif echo $vtModPath | $GREP -q "[.]ko[.]gz$"; then - $BUSYBOX_PATH/zcat $vtModPath > $VTOY_PATH/$vtModName - else - vtlog "unsupport module type" - return - fi - - #step1: modify vermagic/mod crc/relocation - $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug - - #step2: fill parameters - vtPgsize=$($VTOY_PATH/tool/vtoyksym -p) - $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug - - $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName - - if $GREP -q 'dm_patch' /proc/modules; then - echo "done" > $VTOY_PATH/dm_patch_done - fi - -} create_ventoy_device_mapper() { vtlog "create_ventoy_device_mapper $*" @@ -358,28 +257,16 @@ create_ventoy_device_mapper() { fi $VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_dm_table - - - vtLevel1=$($CAT /proc/sys/kernel/printk | $AWK '{print $1}') - vtLevel2=$($CAT /proc/sys/kernel/printk | $AWK '{print $2}') - vtLevel3=$($CAT /proc/sys/kernel/printk | $AWK '{print $3}') - vtLevel4=$($CAT /proc/sys/kernel/printk | $AWK '{print $4}') - if ventoy_need_dm_patch; then - ventoy_dm_patch - #suppress printk message - echo 0 $vtLevel2 0 $vtLevel4 > /proc/sys/kernel/printk - fi + $VTOY_PATH/tool/vtoydm -r -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_raw_table if [ -z "$2" ]; then $VT_DM_BIN create ventoy $VTOY_PATH/ventoy_dm_table >>$VTLOG 2>&1 else $VT_DM_BIN "$2" create ventoy $VTOY_PATH/ventoy_dm_table >>$VTLOG 2>&1 fi - - if ventoy_need_dm_patch; then - #recover printk level - echo $vtLevel1 $vtLevel2 $vtLevel3 $vtLevel4 > /proc/sys/kernel/printk - fi + + RAWDISKNAME=$($HEAD -n1 $VTOY_PATH/ventoy_raw_table | $AWK '{print $4}') + echo "$VT_DM_BIN create ${RAWDISKNAME#/dev/} $VTOY_PATH/ventoy_raw_table" > /ventoy/ventoy_iso_part_dm_cmd } create_persistent_device_mapper() { @@ -399,24 +286,8 @@ create_persistent_device_mapper() { vterr "Error: no dm module avaliable" fi - $VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_persistent_map -d $1 > $VTOY_PATH/persistent_dm_table - - - vtLevel1=$($CAT /proc/sys/kernel/printk | $AWK '{print $1}') - vtLevel2=$($CAT /proc/sys/kernel/printk | $AWK '{print $2}') - vtLevel3=$($CAT /proc/sys/kernel/printk | $AWK '{print $3}') - vtLevel4=$($CAT /proc/sys/kernel/printk | $AWK '{print $4}') - if [ -f $VTOY_PATH/dm_patch_done ]; then - #suppress printk message - echo 0 $vtLevel2 0 $vtLevel4 > /proc/sys/kernel/printk - fi - - $VT_DM_BIN create vtoy_persistent $VTOY_PATH/persistent_dm_table >>$VTLOG 2>&1 - - if [ -f $VTOY_PATH/dm_patch_done ]; then - #recover printk level - echo $vtLevel1 $vtLevel2 $vtLevel3 $vtLevel4 > /proc/sys/kernel/printk - fi + $VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_persistent_map -d $1 > $VTOY_PATH/persistent_dm_table + $VT_DM_BIN create vtoy_persistent $VTOY_PATH/persistent_dm_table >>$VTLOG 2>&1 } @@ -709,11 +580,7 @@ ventoy_udev_disk_common_hook() { if [ -f $VTOY_PATH/ventoy_persistent_map ]; then create_persistent_device_mapper "/dev/$VTDISK" ventoy_create_persistent_link - fi - - if $GREP -q 'dm_patch' /proc/modules; then - $BUSYBOX_PATH/rmmod dm_patch - fi + fi } ventoy_create_dev_ventoy_part() { @@ -721,17 +588,7 @@ ventoy_create_dev_ventoy_part() { $BUSYBOX_PATH/mknod -m 0666 /dev/ventoy b $blkdev_num if [ -e /vtoy_dm_table ]; then - vtPartid=1 - - vtLevel1=$($CAT /proc/sys/kernel/printk | $AWK '{print $1}') - vtLevel2=$($CAT /proc/sys/kernel/printk | $AWK '{print $2}') - vtLevel3=$($CAT /proc/sys/kernel/printk | $AWK '{print $3}') - vtLevel4=$($CAT /proc/sys/kernel/printk | $AWK '{print $4}') - if [ -f $VTOY_PATH/dm_patch_done ]; then - #suppress printk message - echo 0 $vtLevel2 0 $vtLevel4 > /proc/sys/kernel/printk - fi - + vtPartid=1 $CAT /vtoy_dm_table | while read vtline; do echo $vtline > /ventoy/dm_table_part${vtPartid} $VTOY_PATH/tool/dmsetup create ventoy${vtPartid} /ventoy/dm_table_part${vtPartid} @@ -741,11 +598,6 @@ ventoy_create_dev_ventoy_part() { vtPartid=$(expr $vtPartid + 1) done - - if [ -f $VTOY_PATH/dm_patch_done ]; then - #recover printk level - echo $vtLevel1 $vtLevel2 $vtLevel3 $vtLevel4 > /proc/sys/kernel/printk - fi fi } @@ -785,7 +637,12 @@ is_inotify_ventoy_part() { fi if [ -e /dev/$vtShortName ]; then - $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c $vtShortName + if [ "$VTOY_VLNK_BOOT" = "01" ]; then + vtOrgDiskName=$($VTOY_PATH/tool/vtoydump -t $VTOY_PATH/ventoy_os_param) + [ "$vtOrgDiskName" = "/dev/$vtShortName" ] + else + $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c $vtShortName + fi return fi fi @@ -837,3 +694,28 @@ ventoy_check_install_module_xz() { $BUSYBOX_PATH/insmod "$1" fi } + +ventoy_check_umount() { + for vtLoop in 0 1 2 3 4 5 6 7 8 9; do + $BUSYBOX_PATH/umount "$1" > /dev/null 2>&1 + if $BUSYBOX_PATH/mountpoint -q "$1"; then + $SLEEP 1 + else + break + fi + done +} + +ventoy_wait_dir() { + vtdir=$1 + vtsec=0 + + while [ $vtsec -lt $2 ]; do + if [ -d "$vtdir" ]; then + break + else + $SLEEP 1 + vtsec=$(expr $vtsec + 1) + fi + done +}