Ensure correct value from/to SERIALCONSOLE

waynechen55 · waynechen55 · commit c4e6187d36d6 · 2026-03-12T17:29:49.000+08:00
Ensure SERIALCONSOLE always have non-empty serial device like ttySX
instead of sshserial. Default to ttyS1 if empty.
diff --git a/lib/Utils/Backends.pm b/lib/Utils/Backends.pm
@@ -64,12 +64,13 @@ sub save_serial_console {
     my $serialconsole = get_var('SERIALCONSOLE', '');
     return if ($serialconsole ne '');
     $serialconsole = get_var('SERIALDEV', 'ttyS1');
+    $serialconsole = 'ttyS1' if ($serialconsole eq 'sshserial');
     set_var('SERIALCONSOLE', $serialconsole);
     bmwqemu::save_vars();
 }
 
 sub get_serial_console {
-    return get_var('SERIALCONSOLE', get_var('SERIALDEV', 'ttyS1'));
+    return get_var('SERIALCONSOLE', 'ttyS1');
 }
 
 sub set_sshserial_dev {

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,13 @@ sub save_serial_console {`
`64`	`64`	`my $serialconsole = get_var('SERIALCONSOLE', '');`
`65`	`65`	`return if ($serialconsole ne '');`
`66`	`66`	`$serialconsole = get_var('SERIALDEV', 'ttyS1');`
	`67`	`+ $serialconsole = 'ttyS1' if ($serialconsole eq 'sshserial');`
`67`	`68`	`set_var('SERIALCONSOLE', $serialconsole);`
`68`	`69`	`bmwqemu::save_vars();`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`sub get_serial_console {`
`72`		`- return get_var('SERIALCONSOLE', get_var('SERIALDEV', 'ttyS1'));`
	`73`	`+ return get_var('SERIALCONSOLE', 'ttyS1');`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`sub set_sshserial_dev {`