Fix a bug when booting daphile-21.01

diff --git a/IMG/cpio/ventoy/hook/daphile/disk_hook.sh b/IMG/cpio/ventoy/hook/daphile/disk_hook.sh
index 9ae2f6d96cf2e3e983789fd54f85b4507ac866a1..652f942d7e5a7a3446dd7af285160c7b93a91bca 100644 (file)
--- a/IMG/cpio/ventoy/hook/daphile/disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/daphile/disk_hook.sh
@@ -19,6 +19,8 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
 
 . /ventoy/hook/ventoy-hook-lib.sh
 

+/sbin/mdev -s
+

 # Just for KVM test environment
 $BUSYBOX_PATH/modprobe virtio_blk 2>/dev/null
 $BUSYBOX_PATH/modprobe virtio_pci 2>/dev/null
 # Just for KVM test environment
 $BUSYBOX_PATH/modprobe virtio_blk 2>/dev/null
 $BUSYBOX_PATH/modprobe virtio_pci 2>/dev/null


@@ -34,3 +36,6 @@ for i in 0 1 2 3 4 5 6 7 8 9; do
 done
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
 done
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"

+
+$BUSYBOX_PATH/rm -f /dev/dm-*
+

diff --git a/IMG/cpio/ventoy/hook/daphile/ventoy-hook.sh b/IMG/cpio/ventoy/hook/daphile/ventoy-hook.sh
index 176db16bb76357e0d9f5d24a5da85f040f7f9acb..8deee628f9e761090ead2b581edff7124dc13d25 100644 (file)
--- a/IMG/cpio/ventoy/hook/daphile/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/daphile/ventoy-hook.sh
@@ -19,6 +19,6 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 

-$SED "/mount_boot /i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/gentoo/disk_hook.sh"  -i /init    
+$SED "/mount_boot[^(]*$/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/daphile/disk_hook.sh"  -i /init    

 
 $SED "s#'\.\*/block/mmcblk[^ ]*'#'\.\*/block/dm-[0-9]*'#" -i /init
 
 $SED "s#'\.\*/block/mmcblk[^ ]*'#'\.\*/block/dm-[0-9]*'#" -i /init