Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions BUSYBOX/build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
======== How to build ash/hexdump/xzcat for aarch64 ========
#How to get ash.config/hexdump.cofig/xzcat.config
#How to get ash.config/hexdump.config/xzcat.config
#ARCH=arm64 CROSS_COMPILE=aarch64-linux- make allnoconfig
#ARCH=arm64 CROSS_COMPILE=aarch64-linux- make menuconfig
#----> enable static build
Expand All @@ -15,7 +15,7 @@ rename ./busybox to xzcat

======== How to build ash/hexdump/xzcat for mips64el ========
#download mips64el-musl cross toolchain from https://github.com/ventoy/musl-cross-make/releases/download/latest/
#How to get ash.config/hexdump.cofig/xzcat.config
#How to get ash.config/hexdump.config/xzcat.config
#ARCH=mips CROSS_COMPILE=mips64el-linux-musl- make allnoconfig "CFLAGS+=-mips64r2 -mabi=64 -Os" "LDFLAGS+=-mips64r2 -mabi=64 -Os"
#ARCH=mips CROSS_COMPILE=mips64el-linux-musl- make menuconfig "CFLAGS+=-mips64r2 -mabi=64 -Os" "LDFLAGS+=-mips64r2 -mabi=64 -Os"
#----> enable static build
Expand All @@ -34,7 +34,7 @@ rename ./busybox to xzcat
#make menuconfig select static build

======== How to build ash/hexdump/xzcat for x86_64 ==========
#How to get ash.config/hexdump.cofig/xzcat.config
#How to get ash.config/hexdump.config/xzcat.config
#make allnoconfig
#make menuconfig
#----> enable static build
Expand Down
4 changes: 2 additions & 2 deletions DOC/BuildVentoyFromSource.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
sh all_in_one.sh

It should be noted that:
1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other parts contain binaries and are rarely modified, so will not be recompiled everytime.
1. Only grub2/EDK2/IPXE will be recompiled in all_in_one.sh. Other parts contain binaries and are rarely modified, so will not be recompiled every time.
You can rebuild these parts separately if you want.

2. Some parts of Ventoy have a 32-bit and 64-bit version (like 4.9, 4.10, 4.11 follows)
all_in_one.sh only builds the 64bit version of them. If you want to rebuild the 32bit verison, you should create a 32-bit CentOS environment and build them.
all_in_one.sh only builds the 64bit version of them. If you want to rebuild the 32bit version, you should create a 32-bit CentOS environment and build them.
Fortunately these parts are rarely modified, so you only need to build once or you can directly use the binaries I have built.

Besides, after a full compile and packaging, you can only build the part you modified (for example grub2) and run ventoy_pack.sh to generate the package.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ EFI_STATUS EFIAPI ventoy_delete_ramdisk_param(VOID)
Status = gRT->SetVariable(L"VentoyRamDisk", &VarGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
sizeof(g_backup_ramdisk_param), &g_backup_ramdisk_param);
debug("resotre ramdisk variable %r", Status);
debug("restore ramdisk variable %r", Status);
}
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ BOOLEAN ventoy_is_cdrom_dp_exist(VOID)
}

#if 0
/* Block IO procotol */
/* Block IO protocol */
#endif

EFI_STATUS EFIAPI ventoy_block_io_reset
Expand Down Expand Up @@ -1746,7 +1746,7 @@ EFI_STATUS ventoy_hook_keyboard_stop(VOID)
}

#if 0
/* Fixup the 1st cdrom influnce for Windows boot */
/* Fixup the 1st cdrom influence for Windows boot */
#endif

STATIC EFI_STATUS EFIAPI ventoy_wrapper_locate_handle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#endif


/* The following definations are copied from shim source code */
/* The following definitions are copied from shim source code */

#define SHIM_LOCK_GUID {0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } };

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@

#
# It is not possible to prevent ARM compiler calls to generic intrinsic functions.
# This library provides the instrinsic functions generated by a given compiler.
# This library provides the intrinsic functions generated by a given compiler.
# [LibraryClasses.ARM] and NULL mean link this library into all ARM images.
#
NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
Expand Down
2 changes: 1 addition & 1 deletion FUSEISO/vtoy_fuse_iso.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ static int ventoy_parse_dmtable(const char *filename)
return 1;
}

/* read untill the last line */
/* read until the last line */
while (fgets(line, sizeof(line), fp) && g_disk_entry_num < MAX_ENTRY_NUM)
{
sscanf(line, "%u %u linear %s %llu",
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
if test -f "$dir/unifont.$ext"; then
md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
# PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
# PCF and BDF from version 6.3 isn't handled properly by libfreetype.
if test "$md5" = 0a54834d2788c83886a3e1785a6a1e61 || test "$md5" = 28f2565c7a41d8d407e2551159385edb || test "$md5" = dae5e588461b3b92b87b6ffee734f936 || test "$md5" = 4a3d687aa5bb329ed05f4263a1016791 ; then
continue
fi
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/grub-core/commands/efi/fwload.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ grub_efi_load_driver (grub_size_t size, void *boot_image, int connect)
&loaded_image_guid, (void **)&loaded_image);
if (status != GRUB_EFI_SUCCESS)
{
grub_error (GRUB_ERR_BAD_OS, "not a dirver");
grub_error (GRUB_ERR_BAD_OS, "not a driver");
goto fail;
}
grub_dprintf ("efi", "StartImage: %p\n", boot_image);
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/gui_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ check_scrollbar (list_impl_t self)
&& min_height <= (int) self->bounds.height)
return 1;

/* Unprintable dimenstions. */
/* Unprintable dimensions. */
self->draw_scrollbar = 0;
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ read_identifier (struct parsebuf *p)
{
/* Index of the first character of the identifier in p->buf. */
int start;
/* Next index after the last character of the identifer in p->buf. */
/* Next index after the last character of the identifier in p->buf. */
int end;

skip_whitespace (p);
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ terminal_sanity_check (grub_gfxmenu_view_t view)
if (scr_width <= (int) min_terminal_width
|| scr_height <= (int) min_terminal_height)
{
/* The screen resulution is too low. Use all space, except a small border
/* The screen resolution is too low. Use all space, except a small border
to show the user, that it is a window. Then center the window. */
term_width = scr_width - 6 * border_width;
term_height = scr_height - 6 * border_width;
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/grub-core/normal/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ read_config_file (const char *config)
}
else
{
/* $root is guranteed to be defined, otherwise open above would fail */
/* $root is guaranteed to be defined, otherwise open above would fail */
config_dir = grub_xasprintf ("(%s)%s", grub_env_get ("root"), config);
if (config_dir)
grub_env_set ("config_file", config_dir);
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/include/grub/mips64/efi/loongson.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ typedef struct
{
grub_uint16_t vers; /* version */
grub_uint32_t nr_map; /* number of memory_maps */
grub_uint32_t mem_freq; /* memory frequence */
grub_uint32_t mem_freq; /* memory frequency */
struct mem_map {
grub_uint32_t node_id; /* node_id which memory attached to */
grub_uint32_t mem_type; /* system memory, pci memory, pci io, etc. */
Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/include/grub/partition.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct grub_partition
/* The type partition map. */
grub_partition_map_t partmap;

/* The type of partition whne it's on MSDOS.
/* The type of partition when it's on MSDOS.
Used for embedding detection. */
grub_uint8_t msdostype;

Expand Down
2 changes: 1 addition & 1 deletion GRUB2/MOD_SRC/grub-2.04/util/grub-mkrescue.c
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ main (int argc, char *argv[])
argp_argv[0] = argv[0];
argp_argc = 1;

/* argp doesn't allow us to catch unknwon arguments,
/* argp doesn't allow us to catch unknown arguments,
so catch them before passing to argp
*/
{
Expand Down
6 changes: 3 additions & 3 deletions GRUB2/MOD_SRC/grub-2.04/util/grub-module-verifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ struct grub_module_verifier_arch archs[] = {
},
{ "powerpc", 4, 1, EM_PPC, GRUB_MODULE_VERIFY_SUPPORTS_RELA, (int[]){
GRUB_ELF_R_PPC_ADDR16_LO,
GRUB_ELF_R_PPC_REL24, /* It has limited range but GRUB adds trampolines when necessarry. */
GRUB_ELF_R_PPC_REL24, /* It has limited range but GRUB adds trampolines when necessary. */
GRUB_ELF_R_PPC_ADDR16_HA,
GRUB_ELF_R_PPC_ADDR32,
GRUB_ELF_R_PPC_REL32,
GRUB_ELF_R_PPC_PLTREL24,
-1
} },
{ "sparc64", 8, 1, EM_SPARCV9, GRUB_MODULE_VERIFY_SUPPORTS_RELA, (int[]){
R_SPARC_WDISP30, /* It has limited range but GRUB adds trampolines when necessarry. */
R_SPARC_WDISP30, /* It has limited range but GRUB adds trampolines when necessary. */
R_SPARC_HH22,
R_SPARC_HM10,
R_SPARC_LM22,
Expand Down Expand Up @@ -93,7 +93,7 @@ struct grub_module_verifier_arch archs[] = {
-1
} },
{ "arm", 4, 0, EM_ARM, GRUB_MODULE_VERIFY_SUPPORTS_REL, (int[]){
/* Some relocations are range-limited but trampolines are added when necessarry. */
/* Some relocations are range-limited but trampolines are added when necessary. */
R_ARM_ABS32,
R_ARM_CALL,
R_ARM_JUMP24,
Expand Down
4 changes: 2 additions & 2 deletions GRUB2/MOD_SRC/grub-2.04/util/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ SETUP (const char *dir,
{
/*
* On SPARC, the block-list entries need to be based off the beginning
* of the parition, not the beginning of the disk.
* of the partition, not the beginning of the disk.
*/
struct grub_boot_blocklist *block;
block = bl.first_block;
Expand All @@ -595,7 +595,7 @@ SETUP (const char *dir,

/*
* Reserve space for the boot block since it can not be in the
* Parition table on SPARC.
* Partition table on SPARC.
*/
assert (bl.first_block->len > 2);
bl.first_block->start += 2;
Expand Down
2 changes: 1 addition & 1 deletion IMG/cpio/ventoy/hook/alt/udev_disk_hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fi

#
# We do a trick for ATL series here.
# Use /dev/vtCheatLoop and wapper it as a cdrom with bind mount.
# Use /dev/vtCheatLoop and wrapper it as a cdrom with bind mount.
# Then the installer will accept /dev/vtCheatLoop as the install medium.
#
vtCheatLoop=loop6
Expand Down
2 changes: 1 addition & 1 deletion IMG/cpio/ventoy/hook/debian/ventoy-cloud-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if [ $vtSplit -eq 1 ]; then
sh /ventoy/hook/default/auto_install_varexp.sh /tmpcidata/user-data
sh /ventoy/hook/default/auto_install_varexp.sh /tmpcidata/meta-data
else
vtlog "only user-data avaliable"
vtlog "only user-data available"
cp -a $VTOY_PATH/autoinstall /tmpcidata/user-data
touch /tmpcidata/meta-data

Expand Down
2 changes: 1 addition & 1 deletion IMG/cpio/ventoy/hook/default/13-dm-disk.rules
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_GPT_AUTO_ROOT}=="1", SYMLINK+="gpt
# Add inotify watch to track changes on this device.
# Using the watch rule is not optimal - it generates a lot of spurious
# and useless events whenever the device opened for read-write is closed.
# The best would be to generete the event directly in the tool changing
# The best would be to generate the event directly in the tool changing
# relevant information so only relevant events will be processed
# (like creating a filesystem, changing filesystem label etc.).
#
Expand Down
2 changes: 1 addition & 1 deletion IMG/cpio/ventoy/hook/mageia/ventoy-inotifyd-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if is_inotify_ventoy_part $3; then
# cheatcode for mageia
#
# From mageia/soft/drakx/mdk-stage1 source code, we see that the stage1 binary will search
# /tmp/syslog file to determin whether there is a DAC960 cdrom in the system.
# /tmp/syslog file to determine whether there is a DAC960 cdrom in the system.
# So we insert some string to /tmp/syslog file to cheat the stage1 program.
#
$BUSYBOX_PATH/mkdir -p /dev/rd
Expand Down
2 changes: 1 addition & 1 deletion IMG/cpio/ventoy/hook/rhel6/udev_disk_hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fi

#
# We do a trick for rhel6 series here.
# Use /dev/$vtCheatLoop and wapper it as a removable cdrom with bind mount.
# Use /dev/$vtCheatLoop and wrapper it as a removable cdrom with bind mount.
# Then the anaconda installer will accept /dev/$vtCheatLoop as the install medium.
#
ventoy_copy_device_mapper /dev/$vtCheatLoop
Expand Down
14 changes: 7 additions & 7 deletions IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,16 @@ create_ventoy_device_mapper() {

VT_DM_BIN=$(ventoy_find_bin_path dmsetup)
if [ -z "$VT_DM_BIN" ]; then
vtlog "no dmsetup avaliable, lastly try inbox dmsetup"
vtlog "no dmsetup available, lastly try inbox dmsetup"
VT_DM_BIN=$VTOY_PATH/tool/dmsetup
fi

vtlog "dmsetup avaliable in system $VT_DM_BIN"
vtlog "dmsetup available in system $VT_DM_BIN"

if ventoy_check_dm_module "$1"; then
vtlog "device-mapper module check success"
else
vterr "Error: no dm module avaliable"
vterr "Error: no dm module available"
fi

$VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_dm_table
Expand All @@ -279,16 +279,16 @@ create_persistent_device_mapper() {

VT_DM_BIN=$(ventoy_find_bin_path dmsetup)
if [ -z "$VT_DM_BIN" ]; then
vtlog "no dmsetup avaliable, lastly try inbox dmsetup"
vtlog "no dmsetup available, lastly try inbox dmsetup"
VT_DM_BIN=$VTOY_PATH/tool/dmsetup
fi

vtlog "dmsetup avaliable in system $VT_DM_BIN"
vtlog "dmsetup available in system $VT_DM_BIN"

if ventoy_check_dm_module "$1"; then
vtlog "device-mapper module check success"
else
vterr "Error: no dm module avaliable"
vterr "Error: no dm module available"
fi

$VTOY_PATH/tool/vtoydm -p -f $VTOY_PATH/ventoy_persistent_map -d $1 > $VTOY_PATH/persistent_dm_table
Expand Down Expand Up @@ -487,7 +487,7 @@ ventoy_copy_device_mapper() {
vtlog "$VTOY_DM_PATH not exist, now check /dev/dm-X ..."
VT_DM_BIN=$(ventoy_find_bin_path dmsetup)
if [ -z "$VT_DM_BIN" ]; then
vtlog "no dmsetup avaliable, lastly try inbox dmsetup"
vtlog "no dmsetup available, lastly try inbox dmsetup"
VT_DM_BIN=$VTOY_PATH/tool/dmsetup
fi

Expand Down
2 changes: 1 addition & 1 deletion INSTALL/all_in_one.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sh buildedk.sh >> $LOG 2>&1 || exit 1


#
# We almost rarely modifiy these code, so no need to build them everytime
# We almost rarely modify these code, so no need to build them every time
# If you want to rebuild them, just uncomment them.
#

Expand Down
2 changes: 1 addition & 1 deletion INSTALL/grub/grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ function uefi_iso_menu_func {
vt_select_persistence "${chosen_path}"

if ! vt_is_udf "${1}${chosen_path}"; then
# Lenovo EasyStartup need an addional sector for boundary check
# Lenovo EasyStartup need an additional sector for boundary check
if vt_str_begin "$vt_volume_id" "EasyStartup"; then
vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
vt_append_extra_sector 1
Expand Down
2 changes: 1 addition & 1 deletion INSTALL/tool/create_ventoy_iso_part_dm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ if dmsetup -h > /dev/null 2>&1; then
echo "Create /dev/mapper/$VPART success"
fi
else
echo "dmsetup program not avaliable"
echo "dmsetup program not available"
exit 1
fi
2 changes: 1 addition & 1 deletion IPXE/ipxe_mod_code/ipxe-3fe683e/src/net/tcp/iscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ static void iscsi_rx_buffered_data_done ( struct iscsi_session *iscsi ) {
*
* This can be used when the RX PDU type handler wishes to buffer up
* all received data and process the PDU as a single unit. The caller
* is repsonsible for calling iscsi_rx_buffered_data_done() after
* is responsible for calling iscsi_rx_buffered_data_done() after
* processing the data.
*/
static int iscsi_rx_buffered_data ( struct iscsi_session *iscsi,
Expand Down
2 changes: 1 addition & 1 deletion License/license-tinycore.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tinycore follows the GPL-v2 License (see gpl-2.0.txt)

Ventoy does not modify its source code, only its binraries are used.
Ventoy does not modify its source code, only its binaries are used.

2 changes: 1 addition & 1 deletion License/license-zstd.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
zstd follows the BSD License (see BSD.txt)

Ventoy does not modify its source code, only its binrary is used.
Ventoy does not modify its source code, only its binary is used.
2 changes: 1 addition & 1 deletion LinuxGUI/Ventoy2Disk/Lib/exfat/src/libexfat/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
exfat_put_node(ef, existing);
if (rc != 0)
{
/* free clusters even if something went wrong; overwise they
/* free clusters even if something went wrong; otherwise they
will be just lost */
exfat_cleanup_node(ef, existing);
exfat_put_node(ef, dir);
Expand Down
Loading