Commit 6922394d authored by Franco Fichtner's avatar Franco Fichtner

rc: extensive console muting on bootup; closes #1256

parent 81bcdb73
...@@ -57,9 +57,6 @@ function set_networking_interfaces_ports($probe = false) ...@@ -57,9 +57,6 @@ function set_networking_interfaces_ports($probe = false)
$interactive = true; $interactive = true;
$key = null; $key = null;
/* kernel messages clobber stty probing on ifconfig up */
system_console_mute();
$iflist = get_interface_list(false, true); $iflist = get_interface_list(false, true);
if ($probe) { if ($probe) {
...@@ -290,7 +287,6 @@ EOD; ...@@ -290,7 +287,6 @@ EOD;
} }
if (!in_array($key, array('y', 'Y'))) { if (!in_array($key, array('y', 'Y'))) {
system_console_unmute();
fclose($fp); fclose($fp);
return false; return false;
} }
...@@ -420,7 +416,6 @@ EOD; ...@@ -420,7 +416,6 @@ EOD;
write_config("Console assignment of interfaces"); write_config("Console assignment of interfaces");
printf(gettext("done.%s"), "\n"); printf(gettext("done.%s"), "\n");
system_console_unmute();
fclose($fp); fclose($fp);
return true; return true;
......
...@@ -57,6 +57,13 @@ foreach ($inc_files as $inc_file) { ...@@ -57,6 +57,13 @@ foreach ($inc_files as $inc_file) {
echo "done.\n"; 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_devd_configure(true);
system_login_configure(true); system_login_configure(true);
...@@ -104,11 +111,9 @@ system_hosts_generate(true); ...@@ -104,11 +111,9 @@ system_hosts_generate(true);
interfaces_loopback_configure(true); interfaces_loopback_configure(true);
system_syslogd_start(true); system_syslogd_start(true);
system_console_mute(); /* XXX move this further up */
openvpn_prepare_all(true); openvpn_prepare_all(true);
interfaces_configure(true); interfaces_configure(true);
openvpn_resync_all(null, true); openvpn_resync_all(null, true);
system_console_unmute(); /* XXX move this further down */
system_resolvconf_generate(true); system_resolvconf_generate(true);
filter_configure_sync(true); filter_configure_sync(true);
...@@ -192,4 +197,6 @@ if ($setup_installer) { ...@@ -192,4 +197,6 @@ if ($setup_installer) {
} }
} }
system_console_unmute();
exit(0); exit(0);
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
/* parse the configuration and include all functions used below */
require_once("config.inc"); require_once("config.inc");
require_once("config.console.inc"); require_once("config.console.inc");
require_once("filter.inc"); require_once("filter.inc");
...@@ -39,6 +38,8 @@ require_once("services.inc"); ...@@ -39,6 +38,8 @@ require_once("services.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("openvpn.inc"); require_once("openvpn.inc");
system_console_mute();
if (set_networking_interfaces_ports()) { if (set_networking_interfaces_ports()) {
echo "Reloading interfaces..."; echo "Reloading interfaces...";
global $config; global $config;
...@@ -47,3 +48,5 @@ if (set_networking_interfaces_ports()) { ...@@ -47,3 +48,5 @@ if (set_networking_interfaces_ports()) {
echo "done.\n"; echo "done.\n";
enable_rrd_graphing(); enable_rrd_graphing();
} }
system_console_unmute();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment