diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 10:13:18 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 10:13:18 -0300 |
| commit | 152d4cad19f911040a5edf9a36f4ca5d35281f2f (patch) | |
| tree | 5ebac97a9edeb64f990cdae7ef052f8aea7ca2c0 /src/etc/inc/pfsense-utils.inc | |
| parent | 1fd6ed0f6603c0361cfa4f4d0b9542b9560a34d6 (diff) | |
| parent | aee36a292a950dc7715c20590c6f3eb3749cb058 (diff) | |
| download | pfsense-152d4cad19f911040a5edf9a36f4ca5d35281f2f.zip pfsense-152d4cad19f911040a5edf9a36f4ca5d35281f2f.tar.gz | |
Merge branch 'master' into bootstrap
Diffstat (limited to 'src/etc/inc/pfsense-utils.inc')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 2cedc52..be66e8b 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1002,7 +1002,7 @@ function setup_serial_port($when="save", $path="") { if ($g['platform'] != "cdrom") { $serial_only = false; - if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt")) { + if (($g['platform'] == "nanobsd") && isset($g['enableserial_force'])) { $serial_only = true; } else { $specific_platform = system_identify_specific_platform(); @@ -1122,7 +1122,7 @@ function is_serial_enabled() { if (!isset($g['enableserial_force']) && !isset($config['system']['enableserial']) && - ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))) { + ($g['platform'] == "pfSense" || $g['platform'] == "cdrom")) { return false; } |
