keep up with 1.0.67 (#1464)

[Ventoy.git] / IMG / cpio / ventoy / hook / debian / udev_disk_hook.sh

diff --git a/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh b/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
index 77ccfba6dc743e9d88062e3cc4567e9f3c365afb..c46f85b4b16c9705690dbe2ea01c14d3c5e0ced0 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
@@ -41,13 +41,19 @@ ventoy_os_install_dmsetup() {
     fi
 
     # install md-modules
     fi
 
     # install md-modules

-    LINE=$($GREP ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)
+    LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)

     if [ $? -eq 0 ]; then
     if [ $? -eq 0 ]; then

-        LINTCNT=$($GREP -c ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)
+        LINTCNT=$($GREP -i -c ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list)

         if [ $LINTCNT -gt 1 ]; then
             vtlog "more than one pkgs, need to filter..."
             VER=$($BUSYBOX_PATH/uname -r)
         if [ $LINTCNT -gt 1 ]; then
             vtlog "more than one pkgs, need to filter..."
             VER=$($BUSYBOX_PATH/uname -r)

-            LINE=$($GREP ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP $VER)
+            
+            LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i $VER)
+            LINTCNT=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i -c $VER)
+            if [ $LINTCNT -gt 1 ]; then
+                vtlog "Still more than one pkgs, use the first one..."
+                LINE=$($GREP -i ' md-modules.*\.udeb'  $VTOY_PATH/iso_file_list | $GREP -i -m1 $VER)
+            fi

         fi
         install_udeb_from_line "$LINE" ${vt_usb_disk} 
     fi
         fi
         install_udeb_from_line "$LINE" ${vt_usb_disk} 
     fi


@@ -120,6 +126,7 @@ fi
 
 if [ -n "$VT_BUS_USB" ]; then
     vtlog "$1 is USB device"
 
 if [ -n "$VT_BUS_USB" ]; then
     vtlog "$1 is USB device"

+    echo /dev/$1 > /ventoy/list-devices-usb-part

 else
     vtlog "$1 is NOT USB device (bus $ID_BUS)"
     
 else
     vtlog "$1 is NOT USB device (bus $ID_BUS)"
     


@@ -127,15 +134,7 @@ else
         vtlog "boot=, or casper, don't mount"
     else
         vtlog "No boot param, need to mount"
         vtlog "boot=, or casper, don't mount"
     else
         vtlog "No boot param, need to mount"

-        $BUSYBOX_PATH/mkdir /cdrom
-        
-        if [ -b $VTOY_DM_PATH ]; then
-            vtlog "mount $VTOY_DM_PATH ..."
-            $BUSYBOX_PATH/mount -t iso9660 $VTOY_DM_PATH  /cdrom
-        else
-            vtlog "mount /dev/$1 ..."
-            $BUSYBOX_PATH/mount -t iso9660 /dev/$1  /cdrom
-        fi
+        echo /dev/$1 > /ventoy/list-devices-usb-part

     fi
 fi
 
     fi
 fi