From b4576c903af27013ce79a64511a2059942a5b471 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Mon, 1 Jun 2015 18:50:46 -0500 Subject: really fix botched manual merge request. Ticket #4720 --- etc/inc/pfsense-utils.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/inc/pfsense-utils.inc') 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)) { -- cgit v1.1