MyFavMirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2024-12-28 08:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs (#1561)

Browse Source 
* fix bug stopping iteration when --no-floppy is used

* fix gfxmenu theme config handling bug
This commit is contained in:
A1ive 2022-04-06 20:09:45 +08:00 committed by GitHub
parent 8fc8cc6867
commit 2d76fa7303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GRUB2/MOD_SRC/grub-2.04/grub-core/commands/search.c
View File

@ -68,7 +68,7 @@ iterate_device (const char *name, void *data)
/* Skip floppy drives when requested. */ /* Skip floppy drives when requested. */
if (ctx->no_floppy && if (ctx->no_floppy &&
name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9') name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
return 1; return 0;
if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) { if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) {
return 0; return 0;

3
GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/theme_loader.c
View File

@ -456,7 +456,8 @@ read_expression (struct parsebuf *p)
/* Read as a single word -- for numeric values or words without /* Read as a single word -- for numeric values or words without
whitespace. */ whitespace. */
start = p->pos; start = p->pos;
while (has_more (p) && ! is_whitespace (peek_char (p))) while (has_more (p) && ! is_whitespace (peek_char (p))
&& peek_char (p) != '}')
read_char (p); read_char (p);
end = p->pos; end = p->pos;
} }