lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

inc: embed otherwise unused is_serial_enabled()

Browse Source
This commit is contained in:
Franco Fichtner 2015-07-06 22:37:51 +02:00
parent d3c720488c
commit e535d330ea
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/etc/inc/pfsense-utils.inc
View File

@ -667,6 +667,9 @@ function reload_all_sync()
function setup_serial_port($when = 'save', $path = '')
{
global $config;
$serial_enabled = isset($config['system']['enableserial']);
$prefix = "";
if (($when == "upgrade") && (!empty($path)) && is_dir($path.'/boot/'))
$prefix = "/tmp/{$path}";
@ -691,7 +694,7 @@ function setup_serial_port($when = 'save', $path = '')
fwrite($fd, "{$bcs}\n");
}
}
if (is_serial_enabled()) {
if ($serial_enabled) {
fwrite($fd, "-S{$serialspeed} -D\n");
}
fclose($fd);
@ -715,7 +718,7 @@ function setup_serial_port($when = 'save', $path = '')
&& (stripos($bcs, "autoboot_delay") === false))
$new_boot_config[] = $bcs;
if (is_serial_enabled()) {
if ($serial_enabled) {
$new_boot_config[] = 'boot_multicons="YES"';
$new_boot_config[] = 'boot_serial="YES"';
$primaryconsole = $config['system']['primaryconsole'];
@ -739,7 +742,7 @@ function setup_serial_port($when = 'save', $path = '')
$ttys_split = explode("\n", $ttys);
$fd = fopen("/etc/ttys", "w");
$on_off = (is_serial_enabled() ? 'on' : 'off');
$on_off = $serial_enabled ? 'on' : 'off';
if (isset($config['system']['disableconsolemenu'])) {
$console_type = 'Pc';
@ -761,13 +764,6 @@ function setup_serial_port($when = 'save', $path = '')
reload_ttys();
}
function is_serial_enabled()
{
global $config;
return isset($config['system']['enableserial']);
}
function reload_ttys()
{
/* force init(8) to reload /etc/ttys */