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
c84855bb
Commit
c84855bb
authored
Jan 06, 2021
by
longpanda
Browse files
1.0.32 release
parent
f2ed81b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
IMG/cpio/ventoy/hook/debian/antix-disk.sh
IMG/cpio/ventoy/hook/debian/antix-disk.sh
+1
-0
IMG/cpio/ventoy/hook/debian/antix-hook.sh
IMG/cpio/ventoy/hook/debian/antix-hook.sh
+6
-1
INSTALL/grub/grub.cfg
INSTALL/grub/grub.cfg
+9
-2
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/antix-disk.sh
View file @
c84855bb
...
@@ -43,6 +43,7 @@ ventoy_os_install_dmsetup_by_unsquashfs() {
...
@@ -43,6 +43,7 @@ ventoy_os_install_dmsetup_by_unsquashfs() {
vtoy_unsquashfs
-d
$VTOY_PATH
/sqfs
-n
-q
-e
$VTOY_PATH
/fsextract
$VTOY_PATH
/fsdisk
vtoy_unsquashfs
-d
$VTOY_PATH
/sqfs
-n
-q
-e
$VTOY_PATH
/fsextract
$VTOY_PATH
/fsdisk
if
!
[
-e
$VTOY_PATH
/sqfs
${
dmModPath
}
]
;
then
if
!
[
-e
$VTOY_PATH
/sqfs
${
dmModPath
}
]
;
then
rm
-rf
$VTOY_PATH
/sqfs
dmModPath
=
"/lib/modules/
$vtKerVer
/kernel/drivers/md/dm-mod.
$vtKoPo
"
dmModPath
=
"/lib/modules/
$vtKerVer
/kernel/drivers/md/dm-mod.
$vtKoPo
"
echo
$dmModPath
>
$VTOY_PATH
/fsextract
echo
$dmModPath
>
$VTOY_PATH
/fsextract
vtoy_unsquashfs
-d
$VTOY_PATH
/sqfs
-n
-q
-e
$VTOY_PATH
/fsextract
$VTOY_PATH
/fsdisk
vtoy_unsquashfs
-d
$VTOY_PATH
/sqfs
-n
-q
-e
$VTOY_PATH
/fsextract
$VTOY_PATH
/fsdisk
...
...
IMG/cpio/ventoy/hook/debian/antix-hook.sh
View file @
c84855bb
...
@@ -23,7 +23,12 @@ elif $GREP -q '\[ "$FILTERED_LIST" \]' /init; then
...
@@ -23,7 +23,12 @@ elif $GREP -q '\[ "$FILTERED_LIST" \]' /init; then
$SED
'/\[ "$FILTERED_LIST" \]/i\ FILTERED_LIST="/dev/mapper/ventoy $FILTERED_LIST"'
-i
/init
$SED
'/\[ "$FILTERED_LIST" \]/i\ FILTERED_LIST="/dev/mapper/ventoy $FILTERED_LIST"'
-i
/init
fi
fi
$SED
-i
"/_search_for_boot_device_/a
\
$BUSYBOX_PATH
/sh
$VTOY_PATH
/hook/debian/antix-disk.sh"
/init
if
$GREP
-q
'_search_for_boot_device_'
/init
;
then
$SED
-i
"/_search_for_boot_device_/a
\
$BUSYBOX_PATH
/sh
$VTOY_PATH
/hook/debian/antix-disk.sh"
/init
elif
$GREP
-q
'FILTERED_LIST=.*ventoy'
/init
;
then
$SED
-i
"/FILTERED_LIST=.*ventoy/i
\
$BUSYBOX_PATH
/sh
$VTOY_PATH
/hook/debian/antix-disk.sh"
/init
fi
if
[
-f
$VTOY_PATH
/ventoy_persistent_map
]
;
then
if
[
-f
$VTOY_PATH
/ventoy_persistent_map
]
;
then
$SED
's#for param in $cmdline#for param in persist_all $cmdline#g'
-i
/init
$SED
's#for param in $cmdline#for param in persist_all $cmdline#g'
-i
/init
...
...
INSTALL/grub/grub.cfg
View file @
c84855bb
...
@@ -287,7 +287,14 @@ function distro_specify_initrd_file_phase2 {
...
@@ -287,7 +287,14 @@ function distro_specify_initrd_file_phase2 {
if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
vt_cpio_busybox64 "64h"
vt_cpio_busybox64 "64h"
fi
fi
elif [ -f (loop)/boot/initfs.x86_64-efi ]; then
vt_linux_specify_initrd_file /boot/initfs.x86_64-efi
if [ -f (loop)/boot/initfs.i386-pc ]; then
vt_linux_specify_initrd_file /boot/initfs.i386-pc
fi
elif [ -f (loop)/antiX/initrd.gz ]; then
vt_linux_specify_initrd_file /antiX/initrd.gz
fi
fi
}
}
...
@@ -1467,7 +1474,7 @@ function img_unsupport_menuentry {
...
@@ -1467,7 +1474,7 @@ function img_unsupport_menuentry {
#############################################################
#############################################################
#############################################################
#############################################################
set VENTOY_VERSION="1.0.3
1
"
set VENTOY_VERSION="1.0.3
2
"
#ACPI not compatible with Window7/8, so disable by default
#ACPI not compatible with Window7/8, so disable by default
set VTOY_PARAM_NO_ACPI=1
set VTOY_PARAM_NO_ACPI=1
...
...
INSTALL/ventoy/ventoy.cpio
View file @
c84855bb
No preview for this file type
INSTALL/ventoy/vtloopex.cpio
View file @
c84855bb
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