Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
4fd4977c
Commit
4fd4977c
authored
Oct 09, 2021
by
longpanda
Browse files
Fix a bug when install Untangle
parent
93614c32
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
1 deletion
+33
-1
IMG/cpio/ventoy/hook/default/export.list
IMG/cpio/ventoy/hook/default/export.list
+7
-0
IMG/cpio/ventoy/ventoy_chain.sh
IMG/cpio/ventoy/ventoy_chain.sh
+23
-1
IMG/mkcpio.sh
IMG/mkcpio.sh
+3
-0
No files found.
IMG/cpio/ventoy/hook/default/export.list
0 → 100644
View file @
4fd4977c
preseed/file
debian-installer/locale
console-keymaps-at/keymap
keyboard-configuration/xkb-keymap
keyboard-configuration/layout
simple-cdd/profiles
vga
IMG/cpio/ventoy/ventoy_chain.sh
View file @
4fd4977c
...
@@ -348,6 +348,23 @@ if [ -e "$VTOY_PATH/hook/$VTOS/ventoy-hook.sh" ]; then
...
@@ -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
...
@@ -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
if
[
-f
"
$VTOY_PATH
/hook/
$VTOS
/ventoy-before-init.sh"
]
;
then
$BUSYBOX_PATH
/sh
"
$VTOY_PATH
/hook/
$VTOS
/ventoy-before-init.sh"
$BUSYBOX_PATH
/sh
"
$VTOY_PATH
/hook/
$VTOS
/ventoy-before-init.sh"
fi
fi
exec
"
$vtinit
"
if
[
-z
"
$vtEnvExport
"
]
;
then
exec
"
$vtinit
"
else
exec env
$vtEnvExport
"
$vtinit
"
fi
fi
fi
fi
fi
done
done
...
...
IMG/mkcpio.sh
View file @
4fd4977c
...
@@ -62,6 +62,9 @@ cp -a $VENTOY_PATH/VBLADE/vblade-master/vblade_64 tool/
...
@@ -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/lunzip32 tool/
cp
-a
$VENTOY_PATH
/LZIP/lunzip64 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
chmod
-R
777 ./tool
find ./tool | cpio
-o
-H
newc
--owner
=
root:root
>
tool.cpio
find ./tool | cpio
-o
-H
newc
--owner
=
root:root
>
tool.cpio
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment