cmdline: only set ask mode if vga= is present

Commit 9473d9a241 set the ASK mode without checking if there was a
`vga` option provided in the command line.  This breaks existing
behavior, so exit early without changes if `vga` is not present in the
command line.

Fixes: 9473d9a241 ('cmdline: parse multiple instances of the vga option')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Roger Pau Monné authored and Jan Beulich committed 2023-07-10 18:35:09 +02:00
1 parent fd62986f6b
commit b831326ee2
1 file changed
+6 -1
+6 -1
View File
@@ -279,9 +279,13 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo)
{
const char *c = cmdline;
c = find_opt(c, "vga=", true);
if ( !c )
return;
ebo->boot_vid_mode = ASK_VGA;
while ( (c = find_opt(c, "vga=", true)) != NULL )
do
{
unsigned int tmp, vesa_depth, vesa_height, vesa_width;
@@ -332,6 +336,7 @@ static void vga_parse(const char *cmdline, early_boot_opts_t *ebo)
else if ( !strmaxcmp(c, "ask", delim_chars_comma) )
ebo->boot_vid_mode = ASK_VGA;
}
while ( (c = find_opt(c, "vga=", true)) != NULL );
}
#endif
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.