From 789b777d46992bbf7c3280ceb0cf5abd0d7c76e7 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 15 Feb 2022 09:48:48 +0100 Subject: [PATCH] system: try to boot without kernel message mute relics They don't seem to work in some cases and aren't used a lot. --- src/etc/inc/system.inc | 25 ------------------------- src/etc/rc.bootup | 4 ---- src/opnsense/scripts/shell/setports.php | 4 ---- 3 files changed, 33 deletions(-) diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 76b2adc2b..2de912132 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -940,31 +940,6 @@ function system_cron_configure($verbose = false) } } -function system_console_mutable() -{ - /* this function name is a pun :) */ - - global $config; - - return isset($config['system']['primaryconsole']) && - ($config['system']['primaryconsole'] == 'serial' || - $config['system']['primaryconsole'] == 'null'); -} - -function system_console_mute() -{ - if (system_console_mutable()) { - exec('/sbin/conscontrol mute on'); - } -} - -function system_console_unmute() -{ - if (system_console_mutable()) { - exec('/sbin/conscontrol mute off'); - } -} - function system_console_types() { return array( diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index dc39afba0..527562aee 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -68,8 +68,6 @@ convert_config(); * 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); @@ -127,6 +125,4 @@ system_powerd_configure(true); */ system_syslog_start(true); -system_console_unmute(); - exit(0); diff --git a/src/opnsense/scripts/shell/setports.php b/src/opnsense/scripts/shell/setports.php index a98ebfc25..c67b595b4 100755 --- a/src/opnsense/scripts/shell/setports.php +++ b/src/opnsense/scripts/shell/setports.php @@ -35,8 +35,6 @@ require_once("rrd.inc"); require_once("system.inc"); require_once("interfaces.inc"); -system_console_mute(); - if (set_networking_interfaces_ports()) { /* need to stop local servers to prevent faulty leases */ killbypid('/var/dhcpd/var/run/dhcpd.pid', 'TERM', true); @@ -50,5 +48,3 @@ if (set_networking_interfaces_ports()) { plugins_configure('vpn', true); rrd_configure(true); } - -system_console_unmute();