From 941ddb52531feed9f0764f211b4f15b2eecee810 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 9 May 2016 10:27:45 -0300
Subject: [PATCH] A simple fix for #6120

- Retire system_console_configure()
- Replace above call on rc.bootup by setup_serial_port()
---
 src/etc/inc/system.inc | 14 --------------
 src/etc/rc.bootup      |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 6b7d19fff3..e27f4d1b62 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1956,20 +1956,6 @@ function system_do_shell_commands($early = 0) {
 	}
 }
 
-function system_console_configure() {
-	global $config, $g;
-	if (isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "system_console_configure() being called $mt\n";
-	}
-
-	if (isset($config['system']['disableconsolemenu'])) {
-		touch("{$g['varetc_path']}/disableconsole");
-	} else {
-		unlink_if_exists("{$g['varetc_path']}/disableconsole");
-	}
-}
-
 function system_dmesg_save() {
 	global $g;
 	if (isset($config['system']['developerspew'])) {
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index ce93acd96a..3fb775f1d0 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -319,8 +319,8 @@ echo "done.\n";
 /* start load balancer daemon */
 relayd_configure();
 
-/* configure console menu */
-system_console_configure();
+/* configure console menu and serial port*/
+setup_serial_port();
 
 /* start DHCP service */
 services_dhcpd_configure();