From: longpanda Date: Wed, 23 Dec 2020 11:49:12 +0000 (+0800) Subject: 1.0.31 release X-Git-Tag: v1.0.31 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/fb7008f49a85493e34daadf21710a1db3a9c74f7 1.0.31 release --- diff --git a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh index a1431d0..2500810 100644 --- a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh +++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh @@ -39,7 +39,17 @@ if is_inotify_ventoy_part $3; then 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}) diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 03058f1..3e1528f 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -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 diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio index eab7839..29d155a 100644 Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ diff --git a/INSTALL/ventoy/vtloopex.cpio b/INSTALL/ventoy/vtloopex.cpio index 40a86b2..7f96a4c 100644 Binary files a/INSTALL/ventoy/vtloopex.cpio and b/INSTALL/ventoy/vtloopex.cpio differ