Merge branch 'master' of https://github.com/Ventoy/Ventoy

[Ventoy.git] / IMG / cpio / ventoy / hook / crux / disk_hook.sh

diff --git a/IMG/cpio/ventoy/hook/crux/disk_hook.sh b/IMG/cpio/ventoy/hook/crux/disk_hook.sh
index e03374e636a6cef7730a08d492221464adab4540..3afa8b92e62491850e52bb6b746f624b47759cbf 100644 (file)
--- a/IMG/cpio/ventoy/hook/crux/disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/crux/disk_hook.sh
@@ -29,12 +29,24 @@ for i in 0 1 2 3 4 5 6 7 8 9; do
     fi
 done
 
-ventoy_extract_vtloopex /dev/${vtdiskname#/dev/}2  crux
+# no need since 3.6.1
+$BUSYBOX_PATH/modprobe dax      > /dev/null 2>&1
+$BUSYBOX_PATH/modprobe dm-mod   > /dev/null 2>&1
 
-vtLoopExDir=$VTOY_PATH/vtloopex/crux/vtloopex
-$BUSYBOX_PATH/xz -d  $vtLoopExDir/dm-mod/$(uname -r)/64/dax.ko.xz
-$BUSYBOX_PATH/xz -d  $vtLoopExDir/dm-mod/$(uname -r)/64/dm-mod.ko.xz
-$BUSYBOX_PATH/insmod $vtLoopExDir/dm-mod/$(uname -r)/64/dax.ko
-$BUSYBOX_PATH/insmod $vtLoopExDir/dm-mod/$(uname -r)/64/dm-mod.ko
+if $GREP -q 'device-mapper' /proc/devices; then
+    vtlog "dm-mod module check success ..."
+else
+    vtlog "Need to load dm-mod module ..."
+    ventoy_extract_vtloopex ${vtdiskname}2  crux
+
+    vtKver=$(uname -r)
+    vtLoopExDir=$VTOY_PATH/vtloopex/crux/vtloopex
+
+    ventoy_check_install_module_xz $vtLoopExDir/dm-mod/$vtKver/64/dax.ko
+    ventoy_check_install_module_xz $vtLoopExDir/dm-mod/$vtKver/64/dm-mod.ko
+fi
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2"
+
+set_ventoy_hook_finish
+