summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-02-14 11:02:03 -0500
committerjim-p <jimp@pfsense.org>2014-02-14 11:02:03 -0500
commit01c1576292cff8c367da2c9f1916f58506e39cdf (patch)
tree78fae0362eb3c9dae31786839ee67c183e08658a /usr/local/www
parent9525f7a6c8175bf6de9f0d70254f17d63f3af93a (diff)
downloadpfsense-01c1576292cff8c367da2c9f1916f58506e39cdf.zip
pfsense-01c1576292cff8c367da2c9f1916f58506e39cdf.tar.gz
Add a knob to let the user select which console (video or serial) is preferred in cases where there are multiple consoles present. Also provide a way to force this preference.
Diffstat (limited to 'usr/local/www')
-rw-r--r--usr/local/www/system_advanced_admin.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 01e64f0..d2074d7 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -63,6 +63,7 @@ $pconfig['noautocomplete'] = isset($config['system']['webgui']['noautocomplete']
$pconfig['althostnames'] = $config['system']['webgui']['althostnames'];
$pconfig['enableserial'] = $config['system']['enableserial'];
$pconfig['serialspeed'] = $config['system']['serialspeed'];
+$pconfig['primaryconsole'] = $config['system']['primaryconsole'];
$pconfig['enablesshd'] = $config['system']['enablesshd'];
$pconfig['sshport'] = $config['system']['ssh']['port'];
$pconfig['sshdkeyonly'] = isset($config['system']['ssh']['sshdkeyonly']);
@@ -157,6 +158,11 @@ if ($_POST) {
else
unset($config['system']['serialspeed']);
+ if ($_POST['primaryconsole'])
+ $config['system']['primaryconsole'] = $_POST['primaryconsole'];
+ else
+ unset($config['system']['primaryconsole']);
+
if ($_POST['nodnsrebindcheck'] == "yes")
$config['system']['webgui']['nodnsrebindcheck'] = true;
else
@@ -549,6 +555,18 @@ function prot_change() {
<br/><?=gettext("Allows selection of different speeds for the serial console port."); ?>
</td>
</tr>
+ <?php if (!$g['primaryconsole_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?>
+ <tr>
+ <td width="22%" valign="top" class="vncell"><?=gettext("Primary Console")?></td>
+ <td width="78%" class="vtable">
+ <select name="primaryconsole" id="primaryconsole" class="formselect">
+ <option value="serial" <?php if ($pconfig['primaryconsole'] == "serial") echo "selected=\"selected\"";?>>Serial Console</option>
+ <option value="video" <?php if ($pconfig['primaryconsole'] == "video") echo "selected=\"selected\"";?>>VGA Console</option>
+ </select>
+ <br/><?=gettext("Select the preferred console if multiple consoles are present. The preferred console will show pfSense boot script output. All consoles display OS boot messages, console messages, and the console menu."); ?>
+ </td>
+ </tr>
+ <?php endif; ?>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
OpenPOWER on IntegriCloud