mirror of https://github.com/ventoy/Ventoy.git
Fix a bug when install Untangle
This commit is contained in:
parent
93614c3251
commit
4fd4977c3a
|
@ -0,0 +1,7 @@
|
|||
preseed/file
|
||||
debian-installer/locale
|
||||
console-keymaps-at/keymap
|
||||
keyboard-configuration/xkb-keymap
|
||||
keyboard-configuration/layout
|
||||
simple-cdd/profiles
|
||||
vga
|
|
@ -348,6 +348,23 @@ if [ -e "$VTOY_PATH/hook/$VTOS/ventoy-hook.sh" ]; then
|
|||
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 #
|
||||
|
@ -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
|
||||
exec "$vtinit"
|
||||
|
||||
if [ -z "$vtEnvExport" ]; then
|
||||
exec "$vtinit"
|
||||
else
|
||||
exec env $vtEnvExport "$vtinit"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
|
|
@ -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/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
|
||||
|
|
Loading…
Reference in New Issue