summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-11-09 12:13:43 +0545
committerPhil Davis <phil.davis@inf.org>2015-11-09 12:13:43 +0545
commitfaeb9aca253711bcad6b3e4a915f9f4dec7decee (patch)
treec4a700735493314e3f63bc4780894c7a749f81d2
parentd6b8120d1b3962efd4089c880f018bb736ad1a2d (diff)
downloadpfsense-faeb9aca253711bcad6b3e4a915f9f4dec7decee.zip
pfsense-faeb9aca253711bcad6b3e4a915f9f4dec7decee.tar.gz
interfaces_pps_edit use latest GLOB from RELENG_2_2
Use the latest cua* glob from the code in RELENG_2_2 that was "recently" modified to get this right. Remove the debug version that looked for "tty" so that people can use it on real systems now. Forum thread: https://forum.pfsense.org/index.php?topic=102111.0
-rw-r--r--src/usr/local/www/interfaces_ppps_edit.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php
index 285ea7f..f396d4e 100644
--- a/src/usr/local/www/interfaces_ppps_edit.php
+++ b/src/usr/local/www/interfaces_ppps_edit.php
@@ -559,9 +559,7 @@ function build_link_list() {
mwexec("/bin/mkdir -p /var/spool/lock");
if($pconfig['type'] == 'ppp') {
- $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE);
- //DEBUG
- $serialports = glob("/dev/tty?[0-9]{,.[0-9]}", GLOB_BRACE);
+ $serialports = glob("/dev/cua[a-zA-Z][0-9]{,.[0-9],.[0-9][0-9],[0-9],[0-9].[0-9],[0-9].[0-9][0-9]}", GLOB_BRACE);
$serport_count = 0;
OpenPOWER on IntegriCloud