X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d0edcc0ef0b6ef695ce96d2be84f1ebb02453b51..d9182dbfa4fde93adb0b038d3d66f2d68e55cefd:/IMG/cpio/ventoy/hook/guix/ventoy-disk.sh diff --git a/IMG/cpio/ventoy/hook/guix/ventoy-disk.sh b/IMG/cpio/ventoy/hook/guix/ventoy-disk.sh index 6d67941..561dc27 100644 --- a/IMG/cpio/ventoy/hook/guix/ventoy-disk.sh +++ b/IMG/cpio/ventoy/hook/guix/ventoy-disk.sh @@ -19,24 +19,32 @@ . /ventoy/hook/ventoy-hook-lib.sh -if is_ventoy_hook_finished; then +vtlog "######### $0 $* ############" + +VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH + +wait_for_usb_disk_ready + +vtdiskname=$(get_ventoy_disk_name) +if [ "$vtdiskname" = "unknown" ]; then + vtlog "ventoy disk not found" + PATH=$VTPATH_OLD exit 0 fi -vtlog "##### INOTIFYD: $2/$3 is created ..." - -VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH +ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace" -if is_inotify_ventoy_part $3; then - vtlog "find ventoy partition ..." - $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 - - blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/') - vtDM=$(ventoy_find_dm_id ${blkdev_num}) +blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/') +blkdev_num_mknod=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/') +vtDM=$(ventoy_find_dm_id ${blkdev_num}) - vtlog "This is $vtDM ..." +vtlog "blkdev_num=$blkdev_num blkdev_num_mknod=$blkdev_num_mknod vtDM=$vtDM" - set_ventoy_hook_finish +if [ -b /dev/$vtDM ]; then + vtlog "dev already exist ..." +else + vtlog "mknode dev ..." + mknod -m 660 /dev/$vtDM b $blkdev_num_mknod fi PATH=$VTPATH_OLD