Fix a bug when install Untangle

diff --git a/IMG/cpio/ventoy/hook/default/export.list b/IMG/cpio/ventoy/hook/default/export.list
new file mode 100644 (file)
index 0000000..821a574
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/default/export.list
@@ -0,0 +1,7 @@
+preseed/file
+debian-installer/locale
+console-keymaps-at/keymap
+keyboard-configuration/xkb-keymap
+keyboard-configuration/layout
+simple-cdd/profiles
+vga

diff --git a/IMG/cpio/ventoy/ventoy_chain.sh b/IMG/cpio/ventoy/ventoy_chain.sh
index 7bed6d759dbd2a8fff0d25987d779b9d0124b737..a6291d5850fd9e7c2ebe335d26384996fb6ce26e 100644 (file)
--- a/IMG/cpio/ventoy/ventoy_chain.sh
+++ b/IMG/cpio/ventoy/ventoy_chain.sh
@@ -348,6 +348,23 @@ if [ -e "$VTOY_PATH/hook/$VTOS/ventoy-hook.sh" ]; then
 fi
 
 
 fi
 
 

+
+if $GREP -q -i Untangle /proc/version; then
+    for vtPara in $($CAT /proc/cmdline); do
+        vtItemkey=$(echo $vtPara | $AWK -F= '{print $1}')
+        vtItemVal=$(echo $vtPara | $AWK -F= '{print $2}')
+        if $GREP -q -m1 "^$vtItemkey\$" $VTOY_PATH/hook/default/export.list; then
+            vtEnvExport="$vtEnvExport $vtItemkey=$vtItemVal"
+        fi
+    done
+    
+    echo "================ env export ================" >> $VTLOG
+    echo $vtEnvExport >> $VTLOG
+    echo "============================================" >> $VTLOG
+fi
+
+
+

 ####################################################################
 #                                                                  #
 # Step 3 : Run LiveInjection Hook                                  #
 ####################################################################
 #                                                                  #
 # Step 3 : Run LiveInjection Hook                                  #


@@ -406,7 +423,12 @@ for vtinit in $user_rdinit /init /sbin/init /linuxrc; do
             if [ -f "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh" ]; then
                 $BUSYBOX_PATH/sh "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh"
             fi
             if [ -f "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh" ]; then
                 $BUSYBOX_PATH/sh "$VTOY_PATH/hook/$VTOS/ventoy-before-init.sh"
             fi

-            exec "$vtinit"
+            
+            if [ -z "$vtEnvExport" ]; then
+                exec "$vtinit"
+            else
+                exec env $vtEnvExport "$vtinit"
+            fi            

         fi
     fi
 done
         fi
     fi
 done

diff --git a/IMG/mkcpio.sh b/IMG/mkcpio.sh
index 270eb8f6fc1ff191ac933aa00ad3880f3deab659..c204336551bf9d5ccb9b87f5f8ba199030624480 100644 (file)
--- a/IMG/mkcpio.sh
+++ b/IMG/mkcpio.sh
@@ -62,6 +62,9 @@ cp -a $VENTOY_PATH/VBLADE/vblade-master/vblade_64 tool/
 cp -a $VENTOY_PATH/LZIP/lunzip32 tool/
 cp -a $VENTOY_PATH/LZIP/lunzip64 tool/
 
 cp -a $VENTOY_PATH/LZIP/lunzip32 tool/
 cp -a $VENTOY_PATH/LZIP/lunzip64 tool/
 

+cp -a $VENTOY_PATH/cryptsetup/veritysetup32 tool/
+cp -a $VENTOY_PATH/cryptsetup/veritysetup64 tool/
+

 chmod -R 777 ./tool
 
 find ./tool | cpio  -o -H newc --owner=root:root >tool.cpio
 chmod -R 777 ./tool
 
 find ./tool | cpio  -o -H newc --owner=root:root >tool.cpio