Fix the issue that VTOY_LINUX_REMOUNT option does not take effect in latest openSUSE...

[Ventoy.git] / IMG / cpio / ventoy / init_chain

diff --git a/IMG/cpio/ventoy/init_chain b/IMG/cpio/ventoy/init_chain
index 18dba2c5a7e9e5375efb4d5aa27ab3da8085bf47..5a541cf47b5f66626cd09b55b6c6b593845dc0f7 100644 (file)
--- a/IMG/cpio/ventoy/init_chain
+++ b/IMG/cpio/ventoy/init_chain
@@ -77,12 +77,16 @@ ventoy_unpack_initramfs() {
                 if [ "${vtx:5}" = "xzcat" ]; then
                     rm -f $VTOY_PATH/xzlog
                     ${vtx:5} $vtfile 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
                 if [ "${vtx:5}" = "xzcat" ]; then
                     rm -f $VTOY_PATH/xzlog
                     ${vtx:5} $vtfile 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)

-                    

                     if grep -q 'corrupted data' $VTOY_PATH/xzlog; then
                     if grep -q 'corrupted data' $VTOY_PATH/xzlog; then

-                        echo 'xzcat failed, now try xzminidec...' >> $VTLOG        
-                        cat $vtfile | xzminidec | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+                        echo 'xzcat failed, now try xzminidec...' >> $VTLOG                        
+                        rm -f $VTOY_PATH/xzlog
+                        cat $vtfile | xzminidec 2> $VTOY_PATH/xzlog | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+
+                        if grep -q 'limit' $VTOY_PATH/xzlog; then                    
+                            echo 'xzminidec failed, now try xzcat_musl ...' >> $VTLOG  
+                            xzcat_musl $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+                        fi

                     fi
                     fi

-                    

                 else
                     ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
                 fi
                 else
                     ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
                 fi


@@ -108,6 +112,28 @@ ventoy_unpack_initrd() {
     done    
 }
 
     done    
 }
 

+vtfile_head_zero() {
+    local vsize
+    local voffset
+    local vfile
+    local vzero
+    local vdump
+    
+    voffset=0
+    vfile=$1
+    vsize=$(stat -c '%s' ${vfile})
+    vzero=$(hexdump -n 512 -e '512/1 "%02X"' $vfile)
+    
+    while [ $voffset -lt $vsize ]; do
+        vdump=$(hexdump -s $voffset -n 512 -e '512/1 "%02X"' $vfile)
+        if [ "$vdump" != "$vzero" ]; then
+            echo $voffset
+            return
+        fi
+        voffset=$($BUSYBOX_PATH/expr $voffset + 512)
+    done    
+    echo 0
+}

 
 # This export is for busybox cpio command
 export EXTRACT_UNSAFE_SYMLINKS=1
 
 # This export is for busybox cpio command
 export EXTRACT_UNSAFE_SYMLINKS=1


@@ -127,13 +153,22 @@ for vtfile in $(ls /initrd*); do
     #only for cpio,cpio,...,initrd sequence, initrd,cpio or initrd,initrd sequence is not supported
     while [ -e ${vtfile}_tmp ] && [ $(stat -c '%s' ${vtfile}_tmp) -gt 512 ]; do
         mv ${vtfile}_tmp $vtfile
     #only for cpio,cpio,...,initrd sequence, initrd,cpio or initrd,initrd sequence is not supported
     while [ -e ${vtfile}_tmp ] && [ $(stat -c '%s' ${vtfile}_tmp) -gt 512 ]; do
         mv ${vtfile}_tmp $vtfile

+        

         vtdump=$(hexdump -n 512 -e '512/1 "%02X"' $vtfile)
         vtmagic=$(echo $vtdump | sed 's/^\(00\)*//')
         let vtoffset="(${#vtdump}-${#vtmagic})/2"
         
         if [ -z "$vtmagic" ]; then
         vtdump=$(hexdump -n 512 -e '512/1 "%02X"' $vtfile)
         vtmagic=$(echo $vtdump | sed 's/^\(00\)*//')
         let vtoffset="(${#vtdump}-${#vtmagic})/2"
         
         if [ -z "$vtmagic" ]; then

-            echo "terminate with all zero data file" >> $VTLOG
-            break
+            vtHeadZero=$(vtfile_head_zero $vtfile)
+            if [ $vtHeadZero -gt 0 ]; then
+                vtdump=$(hexdump -s $vtHeadZero -n 512 -e '512/1 "%02X"' $vtfile)
+                vtmagic=$(echo $vtdump | sed 's/^\(00\)*//')
+                let vtoffset="(${#vtdump}-${#vtmagic})/2+$vtHeadZero"                
+                echo "skip head $vtHeadZero zeros with magic ${vtmagic:0:4}" >> $VTLOG
+            else
+                echo "terminate with all zero data file" >> $VTLOG            
+                break
+            fi            

         fi
         
         ventoy_unpack_initramfs $vtfile $vtoffset ${vtmagic:0:4} ${vtfile}_tmp
         fi
         
         ventoy_unpack_initramfs $vtfile $vtoffset ${vtmagic:0:4} ${vtfile}_tmp


@@ -185,7 +220,7 @@ ventoy_unpack_injection() {
 
 if [ -e $VTOY_PATH/ventoy_injection ]; then
     echo "### decompress injection ... ###" >>$VTLOG
 
 if [ -e $VTOY_PATH/ventoy_injection ]; then
     echo "### decompress injection ... ###" >>$VTLOG

-    ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1
+    ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1    

 fi
 
 
 fi