diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-07 14:40:06 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-08 13:41:06 -0300 |
| commit | aa3e0749204a7f80c4717d86a2d44c4825888543 (patch) | |
| tree | 4e6394cc9fadbdef7d5b0f393eb19dea96c5bae7 | |
| parent | 37f952082d903edd6786d0d7aee956617d12c95e (diff) | |
| download | pfsense-aa3e0749204a7f80c4717d86a2d44c4825888543.zip pfsense-aa3e0749204a7f80c4717d86a2d44c4825888543.tar.gz | |
Setup XG-154x console to VGA only
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 848159c..d822132 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1105,17 +1105,19 @@ function setup_serial_port($when = "save", $path = "") { $serialspeed = (is_numeric($config['system']['serialspeed'])) ? $config['system']['serialspeed'] : "115200"; if ($g['platform'] != "cdrom") { $serial_only = false; + $vga_only = false; + + $specific_platform = system_identify_specific_platform(); if (($g['platform'] == "nanobsd") && isset($g['enableserial_force'])) { $serial_only = true; - } else { - $specific_platform = system_identify_specific_platform(); - if ($specific_platform['name'] == 'RCC-VE' || - $specific_platform['name'] == 'RCC' || - $specific_platform['name'] == 'RCC-DFF' || - $specific_platform['name'] == 'apu2') { - $serial_only = true; - } + } elseif ($specific_platform['name'] == 'XG-1540') { + $vga_only = true; + } elseif ($specific_platform['name'] == 'RCC-VE' || + $specific_platform['name'] == 'RCC' || + $specific_platform['name'] == 'RCC-DFF' || + $specific_platform['name'] == 'apu2') { + $serial_only = true; } $boot_config_split = explode("\n", $boot_config); @@ -1167,7 +1169,9 @@ function setup_serial_port($when = "save", $path = "") { if ($serial_only === true) { $data[] = 'boot_serial="YES"'; $data[] = 'console="comconsole"'; - } else if (is_serial_enabled()) { + } elseif ($vga_only === true) { + $data[] = 'console="vidconsole"'; + } elseif (is_serial_enabled()) { $data[] = 'boot_multicons="YES"'; $data[] = 'boot_serial="YES"'; $primaryconsole = isset($g['primaryconsole_force']) ? @@ -1184,10 +1188,9 @@ function setup_serial_port($when = "save", $path = "") { } $data[] = 'comconsole_speed="' . $serialspeed . '"'; - $specplatform = system_identify_specific_platform(); - if ($specplatform['name'] == 'RCC-VE' || - $specplatform['name'] == 'RCC' || - $specplatform['name'] == 'RCC-DFF') { + if ($specific_platform['name'] == 'RCC-VE' || + $specific_platform['name'] == 'RCC' || + $specific_platform['name'] == 'RCC-DFF') { $data[] = 'comconsole_port="0x2F8"'; $data[] = 'hint.uart.0.flags="0x00"'; $data[] = 'hint.uart.1.flags="0x10"'; |
