1.0.08beta1

IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh

@@ -19,10 +19,13 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-ventoy_systemd_udevd_work_around
-ventoy_add_udev_rule "$VTOY_PATH/hook/default/udev_disk_hook.sh %k noreplace"
+#ventoy_systemd_udevd_work_around
+#ventoy_add_udev_rule "$VTOY_PATH/hook/default/udev_disk_hook.sh %k noreplace"
 
-#$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/rhel7/ventoy-disk.sh /lib/dracut/hooks/initqueue/01-ventoy-disk.sh
+$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0#" -i /lib/dracut-lib.sh
+ventoy_set_inotify_script  rhel7/ventoy-inotifyd-hook.sh
+
+$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/default/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/01-ventoy-inotifyd-start.sh
 
 # suppress write protected mount warning
 if [ -e /usr/sbin/anaconda-diskroot ]; then

IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh

@@ -23,22 +23,25 @@ if is_ventoy_hook_finished; then
     exit 0
 fi
 
-vtlog "####### $0 $* ########"
+vtlog "##### INOTIFYD: $2/$3 is created ..."
 
 VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 
-wait_for_usb_disk_ready
+if is_inotify_ventoy_part $3; then
+    vtlog "find ventoy partition ..."
+    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
+    
+    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})
 
-vtdiskname=$(get_ventoy_disk_name)
-if [ "$vtdiskname" = "unknown" ]; then
-    vtlog "ventoy disk not found"
-    PATH=$VTPATH_OLD
-    exit 0
+    if [ "$vtDM" = "dm-0" ]; then
+        vtlog "This is dm-0, OK ..."
+    else
+        vtlog "####### This is $vtDM ####### this is abnormal ..."
+        ventoy_swap_device /dev/dm-0 /dev/$vtDM
+    fi
+    
+    set_ventoy_hook_finish
 fi
 
-ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2"
-
 PATH=$VTPATH_OLD
-
-set_ventoy_hook_finish
-