1.0.49 release

diff --git a/IMG/cpio/ventoy/hook/suse/udev_setup_hook.sh b/IMG/cpio/ventoy/hook/suse/udev_setup_hook.sh
new file mode 100644 (file)
index 0000000..c4c90ce
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/suse/udev_setup_hook.sh
@@ -0,0 +1,38 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+wait_for_usb_disk_ready
+
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    exit 0
+fi
+
+vtlog "wait_for_usb_disk_ready $vtdiskname ..."
+
+if echo $vtdiskname | $EGREP -q "nvme|mmc|nbd"; then
+    vtpart2=${vtdiskname}p2
+else
+    vtpart2=${vtdiskname}2
+fi
+
+/ventoy/busybox/sh /ventoy/hook/suse/udev_disk_hook.sh "${vtpart2#/dev/}"

diff --git a/IMG/cpio/ventoy/hook/suse/ventoy-hook.sh b/IMG/cpio/ventoy/hook/suse/ventoy-hook.sh
index 47aa0504e958b495d8baa9c790ea0353b3db9dcd..da1eb2c66f779de4b59bfe01664e2346972c2aa7 100644 (file)
--- a/IMG/cpio/ventoy/hook/suse/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/suse/ventoy-hook.sh
@@ -63,6 +63,9 @@ if [ -e /etc/initrd.functions ] && $GREP -q 'HPIP' /etc/initrd.functions; then
     $BUSYBOX_PATH/mknod -m 660 /dev/console b 5 1
     $SED "/CD_DEVICES=/a $BUSYBOX_PATH/sh $VTOY_PATH/hook/suse/disk_hook.sh" -i /etc/initrd.functions
     $SED "/CD_DEVICES=/a CD_DEVICES=\"/dev/ventoy \$CD_DEVICES\"" -i /etc/initrd.functions
     $BUSYBOX_PATH/mknod -m 660 /dev/console b 5 1
     $SED "/CD_DEVICES=/a $BUSYBOX_PATH/sh $VTOY_PATH/hook/suse/disk_hook.sh" -i /etc/initrd.functions
     $SED "/CD_DEVICES=/a CD_DEVICES=\"/dev/ventoy \$CD_DEVICES\"" -i /etc/initrd.functions

+elif [ -f /scripts/udev_setup ]; then
+    echo "udev_setup" >> $VTLOG
+    echo "/ventoy/busybox/sh /ventoy/hook/suse/udev_setup_hook.sh" >> /scripts/udev_setup    

 else
     echo "SUSE" >> $VTLOG
     ventoy_systemd_udevd_work_around
 else
     echo "SUSE" >> $VTLOG
     ventoy_systemd_udevd_work_around

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 51bb8ef251b3347faac4e15399c3b2a14a200fbc..284cce0807df47ac755811dafb8682c0c7f9c82d 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -159,7 +159,7 @@ function distro_specify_wim_patch {
         vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
         vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM

-    fi
+    fi    

 }
 
 function distro_specify_wim_patch_phase2 {
 }
 
 function distro_specify_wim_patch_phase2 {


@@ -1844,7 +1844,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.48"
+set VENTOY_VERSION="1.0.49"

 
 #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