diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-06-01 18:50:46 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-06-01 18:50:46 -0500 |
| commit | b4576c903af27013ce79a64511a2059942a5b471 (patch) | |
| tree | c36f6d52e589f2665ad8891021e4eb820a5dd507 /etc/inc/pfsense-utils.inc | |
| parent | 78b0dd57d5fe73a896ef5eb73038371cf3c6f99b (diff) | |
| download | pfsense-b4576c903af27013ce79a64511a2059942a5b471.zip pfsense-b4576c903af27013ce79a64511a2059942a5b471.tar.gz | |
really fix botched manual merge request. Ticket #4720
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 08d8761..b48d0bf 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1038,10 +1038,10 @@ function setup_serial_port($when="save", $path="") { // Loop through and only add lines that are not empty, and which // do not contain a console directive. foreach ($boot_config_split as $bcs) { - if (!empty($bcs)) && + if (!empty($bcs) && (stripos($bcs, "console") === false) && (stripos($bcs, "boot_multicons") === false) && - (stripos($bcs, "boot_serial") === false)) && + (stripos($bcs, "boot_serial") === false) && (stripos($bcs, "hw.usb.no_pf") === false) && (stripos($bcs, "hint.uart.0.flags") === false) && (stripos($bcs, "hint.uart.1.flags") === false)) { |
