]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
1.0.31 release v1.0.31
authorlongpanda <admin@ventoy.net>
Wed, 23 Dec 2020 11:49:12 +0000 (19:49 +0800)
committerlongpanda <admin@ventoy.net>
Wed, 23 Dec 2020 11:49:12 +0000 (19:49 +0800)
IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
INSTALL/grub/grub.cfg
INSTALL/ventoy/ventoy.cpio
INSTALL/ventoy/vtloopex.cpio

index a1431d07118f37c47d073e0d64b67983c3f9aa77..25008109f4ff1c826979df0dcc1d94a5e7db6a5f 100644 (file)
@@ -39,7 +39,17 @@ if is_inotify_ventoy_part $3; then
     fi
 
     vtlog "find ventoy partition ..."
     fi
 
     vtlog "find ventoy partition ..."
-    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
+    
+    vtReplaceOpt=noreplace
+    
+    if $GREP -q el8 /proc/version && [ -f /etc/system-release ]; then
+        vtRhel8Ver=$($SED "s#.*8\.\([0-9]*\).*#\1#" /etc/system-release)
+        if [ $vtRhel8Ver -ge 3 ]; then
+            vtReplaceOpt=""
+        fi
+    fi
+    
+    $BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 $vtReplaceOpt
     
     blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
     vtDM=$(ventoy_find_dm_id ${blkdev_num})
     
     blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')  
     vtDM=$(ventoy_find_dm_id ${blkdev_num})
index 03058f1d463246a09607d205848ea0401c0c531e..3e1528f2699d3d32b2cdced38f5de364ca2e83e9 100644 (file)
@@ -1447,7 +1447,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.30"
+set VENTOY_VERSION="1.0.31"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
index eab78398d4c4895bd567866ecffdf76a7cea7811..29d155a7f9f6de70b725498949b3ea603f8e5400 100644 (file)
Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ
index 40a86b212c394d33cd4d753e079ec2d94285835b..7f96a4cca5c41dc7fe863a44368b672ff85c4178 100644 (file)
Binary files a/INSTALL/ventoy/vtloopex.cpio and b/INSTALL/ventoy/vtloopex.cpio differ