summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-02-01 14:02:14 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-02-01 14:02:14 -0200
commit48126e256f42e0628b8d6b7c63363da98a8f3b64 (patch)
tree4e8fae21562f23469f9aec47b818148f90889def
parent25c088de57be43155d7f7df202f800016d5f515d (diff)
downloadpfsense-48126e256f42e0628b8d6b7c63363da98a8f3b64.zip
pfsense-48126e256f42e0628b8d6b7c63363da98a8f3b64.tar.gz
Avoid duplicate hw.usb_no_pf entry on loader.conf
-rw-r--r--etc/inc/pfsense-utils.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index b8d779d..63cc465 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1007,7 +1007,8 @@ function setup_serial_port($when="save", $path="") {
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))
$new_boot_config[] = $bcs;
$serialspeed = (is_numeric($config['system']['serialspeed'])) ? $config['system']['serialspeed'] : "9600";
OpenPOWER on IntegriCloud