diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-06-01 18:09:23 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-06-01 18:09:23 -0500 |
| commit | 78b0dd57d5fe73a896ef5eb73038371cf3c6f99b (patch) | |
| tree | 9d99356b5c6f2e9be1ea16be878a30404ee2c13e /etc/inc/pfsense-utils.inc | |
| parent | ba79655cf4f40a7f6b416353fe7213a5ac5f6970 (diff) | |
| download | pfsense-78b0dd57d5fe73a896ef5eb73038371cf3c6f99b.zip pfsense-78b0dd57d5fe73a896ef5eb73038371cf3c6f99b.tar.gz | |
fix manual merge mistake. Ticket #4720
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 1d7e313..08d8761 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1038,7 +1038,7 @@ 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)) && |
