diff --git a/IMG/cpio/ventoy/loop/lakka/ventoy-disk.sh b/IMG/cpio/ventoy/loop/lakka/ventoy-disk.sh index 88b93796..42a8e7fe 100644 --- a/IMG/cpio/ventoy/loop/lakka/ventoy-disk.sh +++ b/IMG/cpio/ventoy/loop/lakka/ventoy-disk.sh @@ -34,14 +34,18 @@ else vtBit=32 fi -if [ -f $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko.xz ]; then - xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko.xz - insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko -fi +if grep -q "device-mapper" /proc/devices; then + vtlog "device-mapper enabled by system" +else + if [ -f $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko.xz ]; then + xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko.xz + insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dax.ko + fi -if [ -f $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz ]; then - xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz - insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko + if [ -f $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz ]; then + xz -d $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko.xz + insmod $VTOY_PATH/vtloopex/dm-mod/$vtKerVer/$vtBit/dm-mod.ko + fi fi wait_for_usb_disk_ready diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 8f231a23..12ae6d02 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -1796,7 +1796,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.45" +set VENTOY_VERSION="1.0.46" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 diff --git a/INSTALL/ventoy/ipxe.krn b/INSTALL/ventoy/ipxe.krn index 229bdddc..aebf3bbd 100644 Binary files a/INSTALL/ventoy/ipxe.krn and b/INSTALL/ventoy/ipxe.krn differ