diff options
| author | jim-p <jimp@pfsense.org> | 2014-02-14 09:56:37 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-02-14 09:58:17 -0500 |
| commit | 407fbf455bbd10144713343dc6e7950eac386fc2 (patch) | |
| tree | 332643d72ce3595151817313c1c79497a422bd70 | |
| parent | dbfa041c1024edf6836058147714cca89267f8f0 (diff) | |
| download | pfsense-407fbf455bbd10144713343dc6e7950eac386fc2.zip pfsense-407fbf455bbd10144713343dc6e7950eac386fc2.tar.gz | |
Add a mechanism by which the serial port can be forced on always regardless of the config setting. (useful for nano+vga setups)
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 6 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command.php | 2 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_admin.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 0e372f4..52c4519 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -991,7 +991,7 @@ function setup_serial_port($when="save", $path="") { fwrite($fd, "{$bcs}\n"); } } - if(isset($config['system']['enableserial'])) { + if(isset($config['system']['enableserial']) || $g['enableserial_force']) { fwrite($fd, "-D"); } fclose($fd); @@ -1016,7 +1016,7 @@ function setup_serial_port($when="save", $path="") { $new_boot_config[] = $bcs; $serialspeed = (is_numeric($config['system']['serialspeed'])) ? $config['system']['serialspeed'] : "9600"; - if(isset($config['system']['enableserial'])) { + if(isset($config['system']['enableserial']) || $g['enableserial_force']) { $new_boot_config[] = 'boot_multicons="YES"'; $new_boot_config[] = 'boot_serial="YES"'; $new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"'; @@ -1035,7 +1035,7 @@ function setup_serial_port($when="save", $path="") { $fd = fopen("/etc/ttys", "w"); foreach($ttys_split as $tty) { if(stristr($tty, "ttyd0") or stristr($tty, "ttyu0")) { - if(isset($config['system']['enableserial'])) { + if(isset($config['system']['enableserial']) || $g['enableserial_force']) { fwrite($fd, "ttyu0 \"/usr/libexec/getty bootupcli\" cons25 on secure\n"); } else { fwrite($fd, "ttyu0 \"/usr/libexec/getty bootupcli\" cons25 off secure\n"); diff --git a/tmp/post_upgrade_command.php b/tmp/post_upgrade_command.php index fdb1f3c..309be16 100755 --- a/tmp/post_upgrade_command.php +++ b/tmp/post_upgrade_command.php @@ -13,7 +13,7 @@ system("pfSsh.php playback gitsync " . escapeshellarg($config['system']['gitsync']['branch']) . " --upgrading"); } - if($g['platform'] == "embedded") { + if($g['platform'] == "embedded" || $g['enableserial_force']) { $config['system']['enableserial'] = true; write_config(); } diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index ffeac67..01e64f0 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -147,7 +147,7 @@ if ($_POST) { else unset($config['system']['webgui']['noantilockout']); - if ($_POST['enableserial'] == "yes") + if ($_POST['enableserial'] == "yes" || $g['enableserial_force']) $config['system']['enableserial'] = true; else unset($config['system']['enableserial']); @@ -525,7 +525,7 @@ function prot_change() { <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Serial Communications"); ?></td> </tr> - <?php if($g['platform'] == "pfSense" || $g['platform'] == "cdrom"): ?> + <?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Serial Terminal"); ?></td> <td width="78%" class="vtable"> |
