From 03b565250ad695a386319d5c2adf6e731f34efd0 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 27 Aug 2015 07:49:49 -0300
Subject: Obsolete use of /etc/nano_use_vga.txt, Use enableserial_force flag
 instead

---
 src/etc/inc/pfsense-utils.inc                                   | 4 ++--
 src/etc/pfSense.obsoletedfiles                                  | 1 +
 src/etc/rc.initial.firmware_update                              | 2 +-
 src/usr/local/www/system_advanced_admin.php                     | 4 ++--
 src/usr/local/www/system_firmware_auto.php                      | 2 +-
 src/usr/local/www/system_firmware_check.php                     | 2 +-
 src/usr/local/www/widgets/widgets/system_information.widget.php | 2 +-
 tools/builder_common.sh                                         | 3 ---
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 91988c7..2741321 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1002,7 +1002,7 @@ function setup_serial_port($when = "save", $path = "") {
 	if ($g['platform'] != "cdrom") {
 		$serial_only = false;
 
-		if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt")) {
+		if (($g['platform'] == "nanobsd") && isset($g['enableserial_force'])) {
 			$serial_only = true;
 		} else {
 			$specific_platform = system_identify_specific_platform();
@@ -1122,7 +1122,7 @@ function is_serial_enabled() {
 
 	if (!isset($g['enableserial_force']) &&
 	    !isset($config['system']['enableserial']) &&
-	    ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))) {
+	    ($g['platform'] == "pfSense" || $g['platform'] == "cdrom")) {
 		return false;
 	}
 
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index cae1bcf..a6ba2bc 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -23,6 +23,7 @@
 /etc/manpath.config
 /etc/mtree/BSD.x11-4.dist
 /etc/mtree/BSD.x11.dist
+/etc/nano_use_vga.txt
 /etc/ntp.conf
 /etc/pccard.conf
 /etc/periodic/daily/130.clean-msgs
diff --git a/src/etc/rc.initial.firmware_update b/src/etc/rc.initial.firmware_update
index 2dff066..143dbbd 100755
--- a/src/etc/rc.initial.firmware_update
+++ b/src/etc/rc.initial.firmware_update
@@ -19,7 +19,7 @@ if (isset($config['system']['firmware']['alturl']['enable'])) {
 
 $nanosize = "";
 if ($g['platform'] == "nanobsd") {
-	if (file_exists("/etc/nano_use_vga.txt")) {
+	if (!isset($g['enableserial_force'])) {
 		$nanosize = "-nanobsd-vga-";
 	} else {
 		$nanosize = "-nanobsd-";
diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php
index a449452..b6c1aeb 100644
--- a/src/usr/local/www/system_advanced_admin.php
+++ b/src/usr/local/www/system_advanced_admin.php
@@ -556,7 +556,7 @@ function prot_change() {
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("Serial Communications"); ?></td>
 							</tr>
-							<?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?>
+							<?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom")): ?>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Serial Terminal"); ?></td>
 								<td width="78%" class="vtable">
@@ -580,7 +580,7 @@ function prot_change() {
 									<br /><?=gettext("Allows selection of different speeds for the serial console port."); ?>
 								</td>
 							</tr>
-							<?php if (!$g['primaryconsole_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?>
+							<?php if (!$g['primaryconsole_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || !isset($g['enableserial_force']))): ?>
 							<tr>
 								<td width="22%" valign="top" class="vncell"><?=gettext("Primary Console")?></td>
 								<td width="78%" class="vtable">
diff --git a/src/usr/local/www/system_firmware_auto.php b/src/usr/local/www/system_firmware_auto.php
index e2970fa..f25ceb4 100755
--- a/src/usr/local/www/system_firmware_auto.php
+++ b/src/usr/local/www/system_firmware_auto.php
@@ -145,7 +145,7 @@ include("head.inc");
 update_status(gettext("Downloading current version information") . "...");
 $nanosize = "";
 if ($g['platform'] == "nanobsd") {
-	if (file_exists("/etc/nano_use_vga.txt")) {
+	if (!isset($g['enableserial_force'])) {
 		$nanosize = "-nanobsd-vga-";
 	} else {
 		$nanosize = "-nanobsd-";
diff --git a/src/usr/local/www/system_firmware_check.php b/src/usr/local/www/system_firmware_check.php
index 2e56943..8eda4e9 100644
--- a/src/usr/local/www/system_firmware_check.php
+++ b/src/usr/local/www/system_firmware_check.php
@@ -132,7 +132,7 @@ $static_text .= gettext("Downloading new version information...");
 
 $nanosize = "";
 if ($g['platform'] == "nanobsd") {
-	if (file_exists("/etc/nano_use_vga.txt")) {
+	if (!isset($g['enableserial_force'])) {
 		$nanosize = "-nanobsd-vga-";
 	} else {
 		$nanosize = "-nanobsd-";
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index 231f2ee..b40a6e9 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -49,7 +49,7 @@ if ($_REQUEST['getupdatestatus']) {
 
 	$nanosize = "";
 	if ($g['platform'] == "nanobsd") {
-		if (file_exists("/etc/nano_use_vga.txt")) {
+		if (!isset($g['enableserial_force'])) {
 			$nanosize = "-nanobsd-vga-";
 		} else {
 			$nanosize = "-nanobsd-";
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 6405620..fb87690 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -326,9 +326,6 @@ cust_fixup_nanobsd() {
 	if [ "${_NANO_WITH_VGA}" = "nanobsd" ]; then
 		# Tell loader to use serial console early.
 		echo "-S115200 -h" >> ${BOOTCONF}
-	else
-		# Empty file to identify nanobsd_vga images
-		touch ${FINAL_CHROOT_DIR}/etc/nano_use_vga.txt
 	fi
 
 	# Remove old console options if present.
-- 
cgit v1.1