From c782b5867bf959aab0649dc38488dc734ed52fb6 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 10 Apr 2015 16:21:57 -0300
Subject: Setup ADI boards to boot only using serial to avoid duplicated output
 when VGA redirection is enabled

---
 etc/inc/pfsense-utils.inc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 5e0168d..ecb48d7 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -960,6 +960,17 @@ function setup_serial_port($when="save", $path="") {
 
 	$serialspeed = (is_numeric($config['system']['serialspeed'])) ? $config['system']['serialspeed'] : "115200";
 	if ($g['platform'] != "cdrom") {
+		$serial_only = false;
+
+		if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt")) {
+			$serial_only = true;
+		} else {
+			$specific_platform = system_identify_specific_platform();
+			if ($specific_platform['name'] == 'RCC-VE') {
+				$serial_only = true;
+			}
+		}
+
 		$boot_config_split = explode("\n", $boot_config);
 		$fd = fopen($boot_config_file,"w");
 		if($fd) {
@@ -971,7 +982,7 @@ function setup_serial_port($when="save", $path="") {
 						fwrite($fd, "{$bcs}\n");
 				}
 			}
-			if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt"))
+			if ($serial_only === true)
 				fwrite($fd, "-S{$serialspeed} -h");
 			else if (is_serial_enabled())
 				fwrite($fd, "-S{$serialspeed} -D");
@@ -995,12 +1006,11 @@ function setup_serial_port($when="save", $path="") {
 					&& (stripos($bcs, "hw.usb.no_pf") === false))
 					$new_boot_config[] = $bcs;
 
-			if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt")) {
-				$new_boot_config[] = 'boot_serial="YES"';
+			$new_boot_config[] = 'boot_serial="YES"';
+			if ($serial_only === true) {
 				$new_boot_config[] = 'console="comconsole"';
 			} else if (is_serial_enabled()) {
 				$new_boot_config[] = 'boot_multicons="YES"';
-				$new_boot_config[] = 'boot_serial="YES"';
 				$primaryconsole = isset($g['primaryconsole_force']) ? $g['primaryconsole_force'] : $config['system']['primaryconsole'];
 				switch ($primaryconsole) {
 					case "video":
-- 
cgit v1.1