lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: extensive console muting on bootup; closes #1256

Browse Source
This commit is contained in:
Franco Fichtner 2016-12-09 12:28:14 +01:00
parent 81bcdb73e3
commit 6922394d13
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/etc/inc/config.console.inc
View File

@ -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;

11
src/etc/rc.bootup
View File

@ -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);

5
src/etc/rc.initial.setports
View File

@ -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();