X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/096cc99c3c0467be99781aa61f9fc46e0000dbaf..7fa4724743fb687288eba28df902b36a69c47d4e:/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 f6d9cb0..80765e3 100644 --- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh +++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh @@ -305,6 +305,9 @@ ventoy_dm_patch() { if [ "$VTOY_DEBUG_LEVEL" = "01" ]; then printk_addr=$($GREP ' printk$' /proc/kallsyms | $AWK '{print $1}') + if [ -z "$printk_addr" ]; then + printk_addr=$($GREP ' _printk$' /proc/kallsyms | $AWK '{print $1}') + fi vtDebug="-v" else printk_addr=0 @@ -367,8 +370,8 @@ ventoy_dm_patch() { #step2: fill parameters vtPgsize=$($VTOY_PATH/tool/vtoyksym -p) - vtlog "$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" - $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 + vtlog "$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 $vtKv $vtDebug" + $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 $vtKv $vtDebug $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName @@ -892,3 +895,17 @@ ventoy_check_umount() { 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 +}