diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 07:49:49 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 07:49:49 -0300 |
| commit | 03b565250ad695a386319d5c2adf6e731f34efd0 (patch) | |
| tree | 7ce63f44b9f6cb7992685da716ee9c349418bea4 /src/usr/local | |
| parent | 5563e8ba736bee091959ecafd0455b0dd48fcac5 (diff) | |
| download | pfsense-03b565250ad695a386319d5c2adf6e731f34efd0.zip pfsense-03b565250ad695a386319d5c2adf6e731f34efd0.tar.gz | |
Obsolete use of /etc/nano_use_vga.txt, Use enableserial_force flag instead
Diffstat (limited to 'src/usr/local')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index a449452..b6c1aeb 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -556,7 +556,7 @@ function prot_change() { <tr> <td colspan="2" valign="top" class="listtopic"><?=gettext("Serial Communications"); ?></td> </tr> - <?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))): ?> + <?php if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom")): ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Serial Terminal"); ?></td> <td width="78%" class="vtable"> @@ -580,7 +580,7 @@ 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"))): ?> + <?php if (!$g['primaryconsole_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || !isset($g['enableserial_force']))): ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Primary Console")?></td> <td width="78%" class="vtable"> diff --git a/src/usr/local/www/system_firmware_auto.php b/src/usr/local/www/system_firmware_auto.php index e2970fa..f25ceb4 100755 --- a/src/usr/local/www/system_firmware_auto.php +++ b/src/usr/local/www/system_firmware_auto.php @@ -145,7 +145,7 @@ include("head.inc"); update_status(gettext("Downloading current version information") . "..."); $nanosize = ""; if ($g['platform'] == "nanobsd") { - if (file_exists("/etc/nano_use_vga.txt")) { + if (!isset($g['enableserial_force'])) { $nanosize = "-nanobsd-vga-"; } else { $nanosize = "-nanobsd-"; diff --git a/src/usr/local/www/system_firmware_check.php b/src/usr/local/www/system_firmware_check.php index 2e56943..8eda4e9 100644 --- a/src/usr/local/www/system_firmware_check.php +++ b/src/usr/local/www/system_firmware_check.php @@ -132,7 +132,7 @@ $static_text .= gettext("Downloading new version information..."); $nanosize = ""; if ($g['platform'] == "nanobsd") { - if (file_exists("/etc/nano_use_vga.txt")) { + if (!isset($g['enableserial_force'])) { $nanosize = "-nanobsd-vga-"; } else { $nanosize = "-nanobsd-"; diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php index 231f2ee..b40a6e9 100644 --- a/src/usr/local/www/widgets/widgets/system_information.widget.php +++ b/src/usr/local/www/widgets/widgets/system_information.widget.php @@ -49,7 +49,7 @@ if ($_REQUEST['getupdatestatus']) { $nanosize = ""; if ($g['platform'] == "nanobsd") { - if (file_exists("/etc/nano_use_vga.txt")) { + if (!isset($g['enableserial_force'])) { $nanosize = "-nanobsd-vga-"; } else { $nanosize = "-nanobsd-"; |
