diff options
| author | jim-p <jimp@netgate.com> | 2018-11-05 13:31:22 -0500 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-11-05 13:51:26 -0500 |
| commit | 7f40e4a9b5e054357ece0e762e6ced1667487e72 (patch) | |
| tree | 2ff9d134b4103fb300a328b93b1def3625abb5a4 /src | |
| parent | 2887721ccefce2c8ff57a7d2fe0d9b84374cb4b0 (diff) | |
| download | pfsense-7f40e4a9b5e054357ece0e762e6ced1667487e72.zip pfsense-7f40e4a9b5e054357ece0e762e6ced1667487e72.tar.gz | |
Make MBT prefer video console. Fixes #9094
Avoids foot-shooting by restoring a config with serial enabled.
(cherry picked from commit 5e5df38fcd3116c4d0f3fc71622643e962f982a8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index a416cd7..eef6566 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1218,14 +1218,13 @@ function setup_loader_settings($path = "", $upgrade = false) { $serialspeed = (is_numeric($config['system']['serialspeed'])) ? $config['system']['serialspeed'] : "115200"; $vga_only = false; - $hdmi_only = false; $serial_only = false; $specific_platform = system_identify_specific_platform(); $video_console_type = (get_single_sysctl("machdep.bootmethod") == "UEFI") ? "efi" : "vidconsole"; if ($specific_platform['name'] == 'XG-1540') { $vga_only = true; } elseif ($specific_platform['name'] == 'Turbot Dual-E') { - $hdmi_only = true; + $g['primaryconsole_force'] = "video"; } elseif ($specific_platform['name'] == 'RCC-VE' || $specific_platform['name'] == 'RCC' || $specific_platform['name'] == 'SG-2220' || |
