Obsolete use of /etc/nano_use_vga.txt, Use enableserial_force flag instead

3 files changed, 4 insertions, 3 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-";