1.0.06 release

IMG/cpio/ventoy/hook/debian/ventoy-hook.sh

@@ -19,38 +19,69 @@
 
 . $VTOY_PATH/hook/ventoy-os-lib.sh
 
-DISTRO='default'
-
-if [ -d /KNOPPIX ]; then
-    DISTRO='knoppix'
-elif [ -e /etc/initrd-release ]; then
-    if $EGREP -q "ID=.*antix|ID=.*mx" /etc/initrd-release; then
-        DISTRO='antix'
-    fi
-fi
-
-if [ -e /init ]; then
-    if $GREP -q PUPPYSFS /init; then
-        if $GREP -q VEKETSFS /init; then
-            DISTRO='veket'
-        else
-            DISTRO='puppy'
+ventoy_get_debian_distro() {
+    if [ -d /KNOPPIX ]; then
+        echo 'knoppix'; return
+    elif [ -e /etc/initrd-release ]; then
+        if $EGREP -q "ID=.*antix|ID=.*mx" /etc/initrd-release; then
+            echo 'antix'; return
         fi
     fi
-fi
-
-if [ -e /etc/os-release ]; then
-    if $GREP -q 'Tails' /etc/os-release; then
-        DISTRO='tails'
+    
+    if [ -e /init ]; then
+        if $GREP -q PUPPYSFS /init; then
+            if $GREP -q VEKETSFS /init; then
+                echo 'veket'; return
+            else
+                echo 'puppy'; return
+            fi
+        fi
+    fi
+
+    if [ -e /etc/os-release ]; then
+        if $GREP -q 'Tails' /etc/os-release; then
+            echo 'tails'; return
+        fi
     fi
-fi
 
-if [ "$DISTRO"="default" ]; then
     if $GREP -q 'slax/' /proc/cmdline; then
-        DISTRO='slax'
+        echo 'slax'; return
     fi
-fi
+    
+    if $GREP -q 'PVE ' /proc/version; then
+        echo 'pve'; return
+    fi
+    
+    if $GREP -q '[Dd]eepin' /proc/version; then
+        echo 'deepin'; return
+    fi
+    
+    if $GREP -q '[Uu][Oo][Ss] ' /proc/version; then
+        echo 'deepin'; return
+    fi
+    
+    if [ -d /porteus ]; then
+        echo 'porteus'; return
+    fi
+    
+    if $GREP -q 'porteus' /proc/version; then
+        echo 'porteus'; return
+    fi
+    
+    echo 'default'
+}
 
+DISTRO=$(ventoy_get_debian_distro)
 
 echo "##### distribution = $DISTRO ######" >> $VTLOG
 . $VTOY_PATH/hook/debian/${DISTRO}-hook.sh
+
+
+
+
+
+
+
+
+
+

IMG/cpio/ventoy/init

@@ -67,6 +67,12 @@ 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
+    
     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            
@@ -100,12 +106,19 @@ export EXTRACT_UNSAFE_SYMLINKS=1
 
 # special process
 need_xzminidec() {
-    testmagic=$(hexdump -n 2 -e '2/1 "%02X"' /initrd001)
+    if [ -e /initrd001 ]; then
+        testmagic=$(hexdump -n 2 -e '2/1 "%02X"' /initrd001)
+    else
+        testmagic='xxxx'
+    fi
+    
     if [ "FD37" = "${testmagic:0:4}" ]; then
         if echo $vtkerver | grep -q 'kaspersky'; then
             true
         elif echo $vtkerver | grep -q 'kiosk.*Gentoo'; then
             true
+        elif echo $vtkerver | grep -q 'porteus '; then
+            true
         else
             false
         fi

IMG/cpio/ventoy/ventoy.sh

@@ -148,6 +148,13 @@ ventoy_get_os_type() {
         fi
     fi
     
+    if $EGREP -q 'ALT ' /proc/version; then
+        echo 'alt'; return
+    fi
+    
+    if $EGREP -q 'porteus' /proc/version; then
+        echo 'debian'; return
+    fi
     
     echo "default"
 }