Fix VTOY_LINUX_REMOUNT option does not work with latest linux kernel version. (#2661...

[Ventoy.git] / IMG / cpio / ventoy / hook / openEuler / ventoy-hook.sh

diff --git a/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh b/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
index 63bd491056fed7f578a626e9b7326f920b07c5aa..40d67d5daf5e5f6f32c0ba4d26863dcecc12f3dc 100644 (file)
--- a/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
+++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
@@ -24,14 +24,23 @@ if [ -f $VTOY_PATH/autoinstall ]; then
 else
     for vtParam in $($CAT /proc/cmdline); do
         if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then
 else
     for vtParam in $($CAT /proc/cmdline); do
         if echo $vtParam | $GREP -q 'inst.ks=hd:LABEL='; then

+            vtRawKsFull="$vtParam"

             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')

-            VTKS="inst.ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"

             break
         fi
         
         if echo $vtParam | $GREP -q '^ks=.*:/'; then
             break
         fi
         
         if echo $vtParam | $GREP -q '^ks=.*:/'; then

+            vtRawKsFull="$vtParam"

             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
             vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')

-            VTKS="ks=hd:/dev/dm-0:$vtRawKs"
+            VTKS="ks=hd:/dev/ventoy:$vtRawKs"
+            break
+        fi
+        
+        if echo $vtParam | $GREP -q '^inst.ks=.*:/'; then
+            vtRawKsFull="$vtParam"
+            vtRawKs=$(echo $vtParam | $AWK -F: '{print $NF}')
+            VTKS="inst.ks=hd:/dev/ventoy:$vtRawKs"

             break
         fi
     done
             break
         fi
     done


@@ -54,9 +63,18 @@ if [ -f $VTOY_PATH/ventoy_persistent_map ]; then
     $BUSYBOX_PATH/rm -rf $VTOY_PATH/selinuxfs
 fi
 
     $BUSYBOX_PATH/rm -rf $VTOY_PATH/selinuxfs
 fi
 

-

 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG
 
 echo "VTKS=$VTKS  VTOVERLAY=$VTOVERLAY" >> $VTLOG
 

+if [ -n "$vtRawKs" ]; then
+    if echo $vtRawKsFull | $EGREP -q "=http|=https|=ftp|=nfs|=hmc"; then
+        echo "vtRawKsFull=$vtRawKsFull no patch needed." >> $VTLOG
+        vtRawKs=""
+        VTKS=""
+    else
+        echo "$vtRawKs" > $VTOY_PATH/ventoy_ks_rootpath
+    fi    
+fi
+

 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
     for vtDud in $(ls $VTOY_PATH/ventoy_dud*); do
         vtInstDD="$vtInstDD inst.dd=file:$vtDud"
 if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
     for vtDud in $(ls $VTOY_PATH/ventoy_dud*); do
         vtInstDD="$vtInstDD inst.dd=file:$vtDud"


@@ -64,7 +82,7 @@ if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
 fi
 echo "vtInstDD=$vtInstDD" >> $VTLOG
 
 fi
 echo "vtInstDD=$vtInstDD" >> $VTLOG
 

-$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0 $VTKS $vtInstDD#" -i /lib/dracut-lib.sh
+$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/ventoy $VTKS $VTOVERLAY $vtInstDD#" -i /lib/dracut-lib.sh

 
 ventoy_set_inotify_script  openEuler/ventoy-inotifyd-hook.sh
 
 
 ventoy_set_inotify_script  openEuler/ventoy-inotifyd-hook.sh
 


@@ -89,3 +107,7 @@ if [ -f /usr/sbin/anaconda-diskroot ]; then
     $SED  's/^mount $dev $repodir/mount -oro $dev $repodir/' -i /usr/sbin/anaconda-diskroot
 fi
 
     $SED  's/^mount $dev $repodir/mount -oro $dev $repodir/' -i /usr/sbin/anaconda-diskroot
 fi
 

+
+if [ -f $VTOY_PATH/autoinstall ]; then
+    cp -a $VTOY_PATH/hook/openEuler/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
+fi