1.0.09 release

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

diff --git a/IMG/cpio/ventoy/init b/IMG/cpio/ventoy/init
index bfb7adf4bdcdc262e3e84e71ac097cec772fd409..c2b7b507a39b1c631efc24b265b48b7667632a05 100644 (file)
--- a/IMG/cpio/ventoy/init
+++ b/IMG/cpio/ventoy/init
@@ -23,7 +23,7 @@
 # Step 1 : parse kernel debug parameter                            #
 #                                                                  #
 ####################################################################
 # Step 1 : parse kernel debug parameter                            #
 #                                                                  #
 ####################################################################

-mkdir /proc; mount -t proc proc /proc
+[ -d /proc ] || mkdir /proc; mount -t proc proc /proc

 vtcmdline=$(cat /proc/cmdline)
 vtkerver=$(cat /proc/version)
 umount /proc; rm -rf /proc
 vtcmdline=$(cat /proc/cmdline)
 vtkerver=$(cat /proc/version)
 umount /proc; rm -rf /proc


@@ -67,13 +67,30 @@ ventoy_unpack_initramfs() {
     vtfile=$1; vtskip=$2; vtmagic=$3; vttmp=$4    
     echo "=====ventoy_unpack_initramfs: #$*#" >> $VTLOG
     
     vtfile=$1; vtskip=$2; vtmagic=$3; vttmp=$4    
     echo "=====ventoy_unpack_initramfs: #$*#" >> $VTLOG
     

+    #special process
+    #if [ "${vtmagic:0:4}" = '5678' ]; then
+    #    echo -en '\x1F\x8B' | dd status=none of=$vtfile bs=1 count=2 conv=notrunc
+    #    vtmagic='1F8B'
+    #fi
+    

     for vtx in '1F8B zcat' '1F9E zcat' '425A bzcat' '5D00 lzcat' 'FD37 xzcat' '894C lzopcat' '0221 lz4cat' '28B5 zstdcat' '3037 cat'; do
         if [ "${vtx:0:4}" = "${vtmagic:0:4}" ]; then
             echo "vtx=$vtx" >> $VTLOG            
     for vtx in '1F8B zcat' '1F9E zcat' '425A bzcat' '5D00 lzcat' 'FD37 xzcat' '894C lzopcat' '0221 lz4cat' '28B5 zstdcat' '3037 cat'; do
         if [ "${vtx:0:4}" = "${vtmagic:0:4}" ]; then
             echo "vtx=$vtx" >> $VTLOG            

-            if [ $vtskip -eq 0 ]; then
-                ${vtx:5} $vtfile | (cpio -idm 2>>$VTLOG; cat > $vttmp)
+            if [ $vtskip -eq 0 ]; then            
+                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
+                        echo 'xzcat failed, now try xzminidec...' >> $VTLOG        
+                        cat $vtfile | xzminidec | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+                    fi
+                    
+                else
+                    ${vtx:5} $vtfile | (cpio -idmu 2>>$VTLOG; cat > $vttmp)
+                fi

             else
             else

-                dd if=$vtfile skip=$vtskip iflag=skip_bytes status=none | ${vtx:5} | (cpio -idm 2>>$VTLOG; cat > $vttmp)
+                dd if=$vtfile skip=$vtskip iflag=skip_bytes status=none | ${vtx:5} | (cpio -idmu 2>>$VTLOG; cat > $vttmp)

             fi
             break
         fi
             fi
             break
         fi