From ed2ded1c04605d0513fe63bcb380a3e9fcfa2c57 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 23 Jan 2017 18:06:34 +0100
Subject: [PATCH] system: make vt/sc configurable; closes #1343

---
 src/etc/inc/system.inc            |  5 ++++
 src/etc/rc.loader.d/20-misc       |  1 -
 src/www/system_advanced_admin.php | 46 ++++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 27328a6e9..a12b38749 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1715,6 +1715,7 @@ function system_login_configure($verbose = false)
     $new_boot_config['comconsole_speed'] = null;
     $new_boot_config['boot_multicons'] = null;
     $new_boot_config['boot_serial'] = null;
+    $new_boot_config['kern.vty'] = 'vt';
     $new_boot_config['console'] = null;
 
     $console_types = system_console_types();
@@ -1750,6 +1751,10 @@ function system_login_configure($verbose = false)
         @unlink('/boot.config');
     }
 
+    if (empty($config['system']['usevirtualterminal'])) {
+        $new_boot_config['kern.vty'] = 'sc';
+    }
+
     /* reload static values from rc.loader.d */
     mwexecf('/usr/local/etc/rc.loader');
 
diff --git a/src/etc/rc.loader.d/20-misc b/src/etc/rc.loader.d/20-misc
index 97fe13246..964ec149e 100644
--- a/src/etc/rc.loader.d/20-misc
+++ b/src/etc/rc.loader.d/20-misc
@@ -1,3 +1,2 @@
 autoboot_delay="3"
 hw.usb.no_pf="1"
-kern.vty="sc"
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 127eba5a5..650c7a529 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -46,6 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
     $pconfig['disablehttpredirect'] = isset($config['system']['webgui']['disablehttpredirect']);
     $pconfig['disableconsolemenu'] = isset($config['system']['disableconsolemenu']);
+    $pconfig['usevirtualterminal'] = isset($config['system']['usevirtualterminal']);
     $pconfig['disableintegratedauth'] = !empty($config['system']['disableintegratedauth']);
     $pconfig['sudo_allow_wheel'] = $config['system']['sudo_allow_wheel'];
     $pconfig['noantilockout'] = isset($config['system']['webgui']['noantilockout']);
@@ -127,6 +128,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             unset($config['system']['disableconsolemenu']);
         }
 
+        if (!empty($pconfig['usevirtualterminal'])) {
+            $config['system']['usevirtualterminal'] = true;
+        } elseif (isset($config['system']['usevirtualterminal'])) {
+            unset($config['system']['usevirtualterminal']);
+        }
+
         if (!empty($pconfig['disableintegratedauth'])) {
             $config['system']['disableintegratedauth'] = true;
         } elseif (isset($config['system']['disableintegratedauth'])) {
@@ -536,22 +543,6 @@ include("head.inc");
                 <tr>
                   <th colspan="2"><?=gettext("Console Options"); ?></th>
                 </tr>
-                <tr>
-                  <td><a id="help_for_serialspeed" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Serial Speed")?></td>
-                  <td>
-                    <select name="serialspeed" id="serialspeed" class="formselect selectpicker">
-                      <option value="115200" <?=$pconfig['serialspeed'] == "115200" ? 'selected="selected"' : '' ?>>115200</option>
-                      <option value="57600" <?=$pconfig['serialspeed'] == "57600" ? 'selected="selected"' : '' ?>>57600</option>
-                      <option value="38400" <?=$pconfig['serialspeed'] == "38400" ? 'selected="selected"' : '' ?>>38400</option>
-                      <option value="19200" <?=$pconfig['serialspeed'] == "19200" ? 'selected="selected"' : '' ?>>19200</option>
-                      <option value="14400" <?=$pconfig['serialspeed'] == "14400" ? 'selected="selected"' : '' ?>>14400</option>
-                      <option value="9600" <?=$pconfig['serialspeed'] == "9600" ? 'selected="selected"' : '' ?>>9600</option>
-                    </select>
-                    <div class="hidden" for="help_for_serialspeed">
-                      <?=gettext("Allows selection of different speeds for the serial console port."); ?>
-                    </div>
-                  </td>
-                </tr>
                 <tr>
                   <td><a id="help_for_primaryconsole" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Primary Console")?></td>
                   <td width="78%">
@@ -581,6 +572,22 @@ include("head.inc");
                     </div>
                   </td>
                 </tr>
+                <tr>
+                  <td><a id="help_for_serialspeed" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Serial Speed")?></td>
+                  <td>
+                    <select name="serialspeed" id="serialspeed" class="formselect selectpicker">
+                      <option value="115200" <?=$pconfig['serialspeed'] == "115200" ? 'selected="selected"' : '' ?>>115200</option>
+                      <option value="57600" <?=$pconfig['serialspeed'] == "57600" ? 'selected="selected"' : '' ?>>57600</option>
+                      <option value="38400" <?=$pconfig['serialspeed'] == "38400" ? 'selected="selected"' : '' ?>>38400</option>
+                      <option value="19200" <?=$pconfig['serialspeed'] == "19200" ? 'selected="selected"' : '' ?>>19200</option>
+                      <option value="14400" <?=$pconfig['serialspeed'] == "14400" ? 'selected="selected"' : '' ?>>14400</option>
+                      <option value="9600" <?=$pconfig['serialspeed'] == "9600" ? 'selected="selected"' : '' ?>>9600</option>
+                    </select>
+                    <div class="hidden" for="help_for_serialspeed">
+                      <?=gettext("Allows selection of different speeds for the serial console port."); ?>
+                    </div>
+                  </td>
+                </tr>
                 <tr>
                   <td><i class="fa fa-info-circle text-muted"></i></a> <?= gettext("Console menu") ?></td>
                   <td width="78%">
@@ -588,6 +595,13 @@ include("head.inc");
                     <strong><?=gettext("Password protect the console menu"); ?></strong>
                   </td>
                 </tr>
+                <tr>
+                  <td><i class="fa fa-info-circle text-muted"></i></a> <?= gettext('Console driver') ?></td>
+                  <td width="78%">
+                    <input name="usevirtualterminal" type="checkbox" value="yes" <?= empty($pconfig['usevirtualterminal']) ? '' : 'checked="checked"' ?>  />
+                    <strong><?= gettext('Use the virtual terminal driver (vt)') ?></strong>
+                  </td>
+                </tr>
                 <tr>
                   <td><a id="help_for_disableintegratedauth" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Integrated authentication") ?></td>
                   <td width="78%">