1.1.07 release

[Ventoy.git] / IMG / cpio / ventoy / hook / debian / puppy-disk.sh

diff --git a/IMG/cpio/ventoy/hook/debian/puppy-disk.sh b/IMG/cpio/ventoy/hook/debian/puppy-disk.sh
index 600088a28ef6bbd9d356da0b303a27c116aa8d87..17c715f8009db153e33c6942ba646438a8953a81 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/puppy-disk.sh
+++ b/IMG/cpio/ventoy/hook/debian/puppy-disk.sh
@@ -37,12 +37,20 @@ ventoy_os_install_dmsetup_by_fuse() {
 
     mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
 
 
     mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
 

-    sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs)
+    if ls $VTOY_PATH/mnt/iso/zdrv_*.sfs 2>/dev/null; then
+        sfsfile=$(ls $VTOY_PATH/mnt/iso/zdrv_*.sfs)
+    else
+        sfsfile=$(ls $VTOY_PATH/mnt/iso/*.sfs)
+    fi

 
     mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs
 
     kVer=$(uname -r)
     KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)
 
     mount -t squashfs $sfsfile  $VTOY_PATH/mnt/squashfs
 
     kVer=$(uname -r)
     KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)

+    if [ -z "$KoName" ]; then
+        KoName=$(ls $VTOY_PATH/mnt/squashfs/usr/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*)
+    fi
+

     vtlog "insmod $KoName"
     insmod $KoName
 
     vtlog "insmod $KoName"
     insmod $KoName