From 6922394d13c17c2583cc36f33bcaa3e499ff5b96 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 9 Dec 2016 12:28:14 +0100
Subject: [PATCH] rc: extensive console muting on bootup; closes #1256

---
 src/etc/inc/config.console.inc |  5 -----
 src/etc/rc.bootup              | 11 +++++++++--
 src/etc/rc.initial.setports    |  5 ++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc
index 3c67ab703..141637c10 100644
--- a/src/etc/inc/config.console.inc
+++ b/src/etc/inc/config.console.inc
@@ -57,9 +57,6 @@ function set_networking_interfaces_ports($probe = false)
 	$interactive = true;
 	$key = null;
 
-	/* kernel messages clobber stty probing on ifconfig up */
-	system_console_mute();
-
 	$iflist = get_interface_list(false, true);
 
 	if ($probe) {
@@ -290,7 +287,6 @@ EOD;
 	}
 
 	if (!in_array($key, array('y', 'Y'))) {
-		system_console_unmute();
 		fclose($fp);
 		return false;
 	}
@@ -420,7 +416,6 @@ EOD;
 	write_config("Console assignment of interfaces");
 	printf(gettext("done.%s"), "\n");
 
-	system_console_unmute();
 	fclose($fp);
 
 	return true;
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index ac9862ce4..993d2f033 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -57,6 +57,13 @@ foreach ($inc_files as $inc_file) {
 
 echo "done.\n";
 
+/*
+ * Now mute console messages from kernel for this script, it
+ * has consequences for printing bootup info and can clobber
+ * stty probing during interface auto-detection.
+ */
+system_console_mute();
+
 system_devd_configure(true);
 system_login_configure(true);
 
@@ -104,11 +111,9 @@ system_hosts_generate(true);
 interfaces_loopback_configure(true);
 system_syslogd_start(true);
 
-system_console_mute(); /* XXX move this further up */
 openvpn_prepare_all(true);
 interfaces_configure(true);
 openvpn_resync_all(null, true);
-system_console_unmute(); /* XXX move this further down */
 
 system_resolvconf_generate(true);
 filter_configure_sync(true);
@@ -192,4 +197,6 @@ if ($setup_installer) {
     }
 }
 
+system_console_unmute();
+
 exit(0);
diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index 0e6a6593c..88ba0ed7a 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -27,7 +27,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* parse the configuration and include all functions used below */
 require_once("config.inc");
 require_once("config.console.inc");
 require_once("filter.inc");
@@ -39,6 +38,8 @@ require_once("services.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
 
+system_console_mute();
+
 if (set_networking_interfaces_ports()) {
     echo "Reloading interfaces...";
     global $config;
@@ -47,3 +48,5 @@ if (set_networking_interfaces_ports()) {
     echo "done.\n";
     enable_rrd_graphing();
 }
+
+system_console_unmute();