1.0.16 release

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

diff --git a/IMG/cpio/ventoy/init b/IMG/cpio/ventoy/init
index bfb7adf4bdcdc262e3e84e71ac097cec772fd409..ad5ac3a9ef149d8569a39017646f920a420ac22e 100644 (file)
--- a/IMG/cpio/ventoy/init
+++ b/IMG/cpio/ventoy/init
@@ -23,7 +23,7 @@
 # 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
@@ -51,7 +51,17 @@ fi
 #                                                                  #
 ####################################################################
 cd /
-rm -rf /init /linuxrc /sbin /dev/  /root
+rm -rf /init /linuxrc /dev/  /root
+
+vtSbinFileNum=$(ls -1 /sbin | wc -l)
+if [ $vtSbinFileNum -eq 1 ]; then
+    echo "remove whole sbin directory" >> $VTLOG
+    rm -rf /sbin
+else
+    echo "remove only sbin/init file" >> $VTLOG
+    ls -l /sbin >> $VTLOG
+    rm -f /sbin/init
+fi
 
 ventoy_is_initrd_ramdisk() {
     #As I known, PCLinuxOS use ramdisk
@@ -62,18 +72,47 @@ ventoy_is_initrd_ramdisk() {
     fi
 }
 
+ventoy_mount_squashfs() {
+    mkdir /dev
+    mount -t devtmpfs devtmpfs /dev    
+    dd if=$1 of=/dev/ram0 status=none
+    umount /dev && rm -rf /dev
+}
+
 # param: file skip magic tmp
 ventoy_unpack_initramfs() {        
     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
+    
+    if [ "${vtmagic:0:4}" = '6873' ]; then
+        ventoy_mount_squashfs $vtfile
+        return
+    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            
-            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
-                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
@@ -144,7 +183,40 @@ fi
 
 ####################################################################
 #                                                                  #
-# Step 3 : Hand over to ventoy.sh                                  #
+# Step 3 : Extract injection archive                               #
+#                                                                  #
+####################################################################
+ventoy_unpack_injection() {
+    vtmagic=$(hexdump -n 2 -e '2/1 "%02X"' $VTOY_PATH/ventoy_injection)
+    echo "ventoy_unpack_injection  vtmagic=$vtmagic ..."
+    
+    if [ "1F8B" = "$vtmagic" ] || [ "1F9E" = "$vtmagic" ]; then
+        echo "tar.gz  tar -xzvf"
+        tar -xzvf $VTOY_PATH/ventoy_injection -C /
+    elif [ "425A" = "$vtmagic" ]; then
+        echo "tar.bz2  tar -xjvf"
+        tar -xjvf $VTOY_PATH/ventoy_injection -C / 
+    elif [ "FD37" = "$vtmagic" ]; then
+        echo "tar.xz  tar -xJvf"
+        tar -xJvf $VTOY_PATH/ventoy_injection -C /
+    elif [ "5D00" = "$vtmagic" ]; then
+        echo "tar.lzma  tar -xavf"
+        tar -xavf $VTOY_PATH/ventoy_injection -C /
+    else
+        echo "unzip -o"
+        unzip -o $VTOY_PATH/ventoy_injection -d /
+    fi
+}
+
+if [ -e $VTOY_PATH/ventoy_injection ]; then
+    echo "### decompress injection ... ###" >>$VTLOG
+    ventoy_unpack_injection > $VTOY_PATH/injection.log 2>&1
+fi
+
+
+####################################################################
+#                                                                  #
+# Step 4 : Hand over to ventoy.sh                                  #
 #                                                                  #
 ####################################################################
 echo "Now hand over to ventoy.sh" >>$VTLOG