diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-23 12:50:21 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-23 12:50:21 -0300 |
| commit | 02226b924f58b216b8771d65717d8d3d6b457d76 (patch) | |
| tree | aac2474d36b86fac61cfff9a4fef98e86816d82a /etc/inc/interfaces.inc | |
| parent | a8cc4ac70e1018f4ce146c909f1e81f2562eef47 (diff) | |
| parent | 25a2bf77d77de2ad0f5a9f3c9daf18b88e90b844 (diff) | |
| download | pfsense-02226b924f58b216b8771d65717d8d3d6b457d76.zip pfsense-02226b924f58b216b8771d65717d8d3d6b457d76.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/config.lib.inc
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 15c7a85..44bad2b 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -713,7 +713,10 @@ function interfaces_configure() { $delayed_list[$if] = $ifname; else if (strstr($realif, "gif")) $delayed_list[$if] = $ifname; - else { + else if (strstr($realif, "ovpn")) { + //echo "Delaying OpenVPN interface configuration...done.\n"; + continue; + } else { if ($g['booting']) printf(gettext("Configuring %s interface..."), $ifname); if($g['debug']) @@ -3190,7 +3193,7 @@ function is_altq_capable($int) { $capable = array("age", "ale", "an", "ath", "aue", "awi", "bce", "bfe", "bge", "dc", "de", "ed", "em", "ep", "fxp", "gem", "hme", "igb", "ipw", "iwi", "jme", "le", "msk", "mxge", "my", "nfe", - "npe", "nve", "ral", "re", "rl", "rum", "sf", "sis", "sk", + "npe", "nve", "ral", "re", "rl", "rum", "run", "bwn", "sf", "sis", "sk", "ste", "stge", "txp", "udav", "ural", "vge", "vr", "wi", "xl", "ndis", "tun", "ovpns", "ovpnc", "vlan", "pppoe", "pptp", "ng", "l2tp", "ppp"); |
