Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
6630ab35
Commit
6630ab35
authored
Oct 17, 2020
by
longpanda
Browse files
1.0.24 release
parent
c0d478c2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
18 deletions
+21
-18
IMG/cpio/ventoy/hook/debian/default-hook.sh
IMG/cpio/ventoy/hook/debian/default-hook.sh
+4
-5
IMG/cpio/ventoy/hook/debian/list-devices
IMG/cpio/ventoy/hook/debian/list-devices
+9
-0
IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
+1
-9
INSTALL/grub/grub.cfg
INSTALL/grub/grub.cfg
+7
-4
INSTALL/ventoy/ventoy.cpio
INSTALL/ventoy/ventoy.cpio
+0
-0
INSTALL/ventoy/vtloopex.cpio
INSTALL/ventoy/vtloopex.cpio
+0
-0
No files found.
IMG/cpio/ventoy/hook/debian/default-hook.sh
View file @
6630ab35
...
...
@@ -33,12 +33,11 @@ if [ -e /init ] && $GREP -q '^mountroot$' /init; then
fi
elif
[
-e
"
$CD_DETECT
"
]
;
then
echo
"
$CD_DETECT
exist, now add hook in it..."
>>
$VTLOG
$SED
"1 a
$BUSYBOX_PATH
/sh
$VTOY_PATH
/hook/debian/disk_mount_hook.sh"
-i
"
$CD_DETECT
"
TITLE_LINE
=
$(
$GREP
-m1
'^hw-detect.*detect_progress_title'
"
$CD_DETECT
"
)
if
[
$?
-eq
0
]
;
then
echo
"add
$TITLE_LINE
for hook"
>>
$VTLOG
$SED
"1 a
$TITLE_LINE
"
-i
"
$CD_DETECT
"
if
[
-e
/bin/list-devices
]
;
then
mv
/bin/list-devices /bin/list-devices-bk
cp
-a
/ventoy/hook/debian/list-devices /bin/list-devices
fi
elif
[
-e
/init
]
&&
$GREP
-q
'/start-udev$'
/init
;
then
echo
"Here use notify ..."
>>
$VTLOG
...
...
IMG/cpio/ventoy/hook/debian/list-devices
0 → 100644
View file @
6630ab35
#! /bin/sh
if
[
"
$1
"
=
"usb-partition"
-a
-z
"
$2
"
]
;
then
if
[
-f
/ventoy/list-devices-usb-part
]
;
then
cat
/ventoy/list-devices-usb-part
fi
fi
/bin/list-devices-bk
$*
IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
View file @
6630ab35
...
...
@@ -133,15 +133,7 @@ else
vtlog
"boot=, or casper, don't mount"
else
vtlog
"No boot param, need to mount"
$BUSYBOX_PATH
/mkdir /cdrom
if
[
-b
$VTOY_DM_PATH
]
;
then
vtlog
"mount
$VTOY_DM_PATH
..."
$BUSYBOX_PATH
/mount
-t
iso9660
$VTOY_DM_PATH
/cdrom
else
vtlog
"mount /dev/
$1
..."
$BUSYBOX_PATH
/mount
-t
iso9660 /dev/
$1
/cdrom
fi
echo
/dev/
$1
>
/ventoy/list-devices-usb-part
fi
fi
...
...
INSTALL/grub/grub.cfg
View file @
6630ab35
...
...
@@ -1044,12 +1044,12 @@ function vtoyboot_common_func {
ventoy_debug_pause
if [ -n "$vtoy_chain_mem_addr" ]; then
ventoy_acpi_param ${vtoy_chain_mem_addr} 512
if [ "$grub_platform" = "pc" ]; then
if [ "$grub_platform" = "pc" ]; then
vt_acpi_param ${vtoy_chain_mem_addr} 512
linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
boot
else
ventoy_acpi_param ${vtoy_chain_mem_addr} 512
ventoy_cli_console
chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
boot
...
...
@@ -1344,7 +1344,10 @@ function img_unsupport_menuentry {
#############################################################
#############################################################
set VENTOY_VERSION="1.0.23"
set VENTOY_VERSION="1.0.24"
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
# Default menu display mode, you can change it as you want.
# 0: List mode
...
...
INSTALL/ventoy/ventoy.cpio
View file @
6630ab35
No preview for this file type
INSTALL/ventoy/vtloopex.cpio
View file @
6630ab35
No preview for this file type
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