Fixe the boot issue for Fedora when VTOY_LINUX_REMOUNT=1

diff --git a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
index 4a2435e1d6bdfd43ce425f12d25ec86c1b22e339..40df0e7959a1fc3f40d9b42152fc442bc6879b92 100644 (file)
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
@@ -29,14 +29,7 @@ if is_inotify_ventoy_part $3; then
 
     vtlog "##### INOTIFYD: $2/$3 is created (YES) ..."
 
 
     vtlog "##### INOTIFYD: $2/$3 is created (YES) ..."
 

-    vtGenRulFile='/etc/udev/rules.d/99-live-squash.rules'
-    if [ -e $vtGenRulFile ] && $GREP -q dmsquash $vtGenRulFile; then
-        vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
-        vtlog "vtScript=$vtScript"
-        $vtScript
-    else
-        vtlog "$vtGenRulFile not exist..."
-    fi
+    

 
     vtlog "find ventoy partition ..."
     
 
     vtlog "find ventoy partition ..."
     


@@ -57,6 +50,17 @@ if is_inotify_ventoy_part $3; then
         ventoy_swap_device /dev/dm-0 /dev/$vtDM
     fi
     
         ventoy_swap_device /dev/dm-0 /dev/$vtDM
     fi
     

+    
+    vtGenRulFile='/etc/udev/rules.d/99-live-squash.rules'
+    if [ -e $vtGenRulFile ] && $GREP -q dmsquash $vtGenRulFile; then
+        vtScript=$($GREP -m1 'RUN.=' $vtGenRulFile | $AWK -F'RUN.=' '{print $2}' | $SED 's/"\(.*\)".*/\1/')
+        vtlog "vtScript=$vtScript"
+        $vtScript
+    else
+        vtlog "$vtGenRulFile not exist..."
+    fi
+    
+    

     if [ -e /sbin/anaconda-diskroot ]; then
         vtlog "set anaconda-diskroot ..."
         /sbin/anaconda-diskroot /dev/dm-0    
     if [ -e /sbin/anaconda-diskroot ]; then
         vtlog "set anaconda-diskroot ..."
         /sbin/anaconda-diskroot /dev/dm-0    

diff --git a/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh b/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
index 22a3dd4acd65090884af324ffc7d8fa93ea834af..ee68b12459b24331bd7ca4bd9659f96f40601c57 100644 (file)
--- a/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
+++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
@@ -19,6 +19,10 @@
 
 . /ventoy/hook/ventoy-hook-lib.sh
 
 
 . /ventoy/hook/ventoy-hook-lib.sh
 

+if [ ! -e /dev/dm-0 ]; then
+    exit 0
+fi
+

 if ! [ -e /dev/mapper/ventoy ]; then
     vtlog "link to /dev/mapper/ventoy"
     ln -s /dev/dm-0 /dev/mapper/ventoy
 if ! [ -e /dev/mapper/ventoy ]; then
     vtlog "link to /dev/mapper/ventoy"
     ln -s /dev/dm-0 /dev/mapper/ventoy

diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
index ad05c7c806ab186eeff3863cd7bd19932efd14be..db33eec220f4c44746a1888e799e56fa65a80020 100644 (file)
--- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
@@ -350,10 +350,12 @@ ventoy_dm_patch() {
     fi
     
     #step1: modify vermagic/mod crc/relocation
     fi
     
     #step1: modify vermagic/mod crc/relocation

+    vtlog "$VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug"

     $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug
     
     #step2: fill parameters
     vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)
     $VTOY_PATH/tool/vtoykmod -u $VTOY_PATH/tool/$vtKoName $VTOY_PATH/$vtModName $vtDebug
     
     #step2: fill parameters
     vtPgsize=$($VTOY_PATH/tool/vtoyksym -p)

+    vtlog "$VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug"

     $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug
 
     $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName
     $VTOY_PATH/tool/vtoykmod -f $VTOY_PATH/tool/$vtKoName $vtPgsize 0x$printk_addr 0x$ro_addr 0x$rw_addr $get_addr $get_size $put_addr $put_size 0x$kprobe_reg_addr 0x$kprobe_unreg_addr $vtDebug
 
     $BUSYBOX_PATH/insmod $VTOY_PATH/tool/$vtKoName