diff options
| author | jim-p <jimp@netgate.com> | 2018-11-05 13:30:58 -0500 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-11-05 13:51:24 -0500 |
| commit | 2887721ccefce2c8ff57a7d2fe0d9b84374cb4b0 (patch) | |
| tree | 5398d38bc2c628a639e807f8e5dbd556228ee2dd /src | |
| parent | 307ee672bf01a44f42e5a7bd66dae75bef8e4788 (diff) | |
| download | pfsense-2887721ccefce2c8ff57a7d2fe0d9b84374cb4b0.zip pfsense-2887721ccefce2c8ff57a7d2fe0d9b84374cb4b0.tar.gz | |
Use EFI console when needed. Fixes #8978
(cherry picked from commit 2f73f2f9eca656c2de5b836f4d0292186147e788)
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index c81078e..a416cd7 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1221,6 +1221,7 @@ function setup_loader_settings($path = "", $upgrade = 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') { @@ -1271,7 +1272,7 @@ function setup_loader_settings($path = "", $upgrade = false) { $data[] = 'console="comconsole"'; $data[] = 'comconsole_speed="' . $serialspeed . '"'; } elseif ($vga_only === true) { - $data[] = 'console="vidconsole"'; + $data[] = "console=\"{$video_console_type}\""; } elseif (is_serial_enabled()) { $data[] = 'boot_multicons="YES"'; $data[] = 'boot_serial="YES"'; @@ -1280,11 +1281,11 @@ function setup_loader_settings($path = "", $upgrade = false) { $config['system']['primaryconsole']; switch ($primaryconsole) { case "video": - $data[] = 'console="vidconsole,comconsole"'; + $data[] = "console=\"{$video_console_type},comconsole\""; break; case "serial": default: - $data[] = 'console="comconsole,vidconsole"'; + $data[] = "console=\"comconsole,{$video_console_type}\""; } $data[] = 'comconsole_speed="' . $serialspeed . '"'; } |
