From: longpanda Date: Tue, 14 Jun 2022 05:33:59 +0000 (+0800) Subject: Fix a bug when booting daphile-21.01 X-Git-Tag: v1.0.77~7 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/61f289aa8a32598e76c8a3c59f952e3abe2a76aa?ds=sidebyside 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 9ae2f6d..652f942 100644 --- 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 +/sbin/mdev -s + # 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" + +$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 176db16..8deee62 100644 --- 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 -$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