diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2014-11-28 12:50:48 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2014-11-28 12:50:48 +0100 |
| commit | 42982b22d1d2469874e3086ae7737e7f3413e6b0 (patch) | |
| tree | 056a814298478d3266dbb4d3833fa2e48ae0304a /etc/inc | |
| parent | 6f1b89e9a88a168696e9c3195cc07473f61f5c4b (diff) | |
| download | pfsense-42982b22d1d2469874e3086ae7737e7f3413e6b0.zip pfsense-42982b22d1d2469874e3086ae7737e7f3413e6b0.tar.gz | |
Bring back the old way of waiting for 3 times of 10seconds on bootup for a ppp type interface to come up. while here also do bringup of virtual interfaces only when not booting
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index ee79e71..6207cd9 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1823,12 +1823,10 @@ EOD; } /* wait for upto 10 seconds for the interface to appear (ppp(oe)) */ $i = 0; - while($i < 10) { - unset($out); - exec("/sbin/ifconfig " . escapeshellarg($ppp['if']) . " 2>&1", $out, $ret); - if($ret == 0) + while($i < 3) { + sleep(10); + if (does_interface_exist($ppp['if'], true)) break; - sleep(1); $i++; } @@ -2883,7 +2881,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven $interface_to_check = $realhwif; /* Need to check that the interface exists or not in the case where its coming back from disabled state see #3270 */ - if (in_array(substr($realif, 0, 3), array("gre", "gif")) || !does_interface_exist($interface_to_check)) + if (!platform_booting() && (in_array(substr($realif, 0, 3), array("gre", "gif")) || !does_interface_exist($interface_to_check))) interface_virtual_create($interface_to_check); /* Disable Accepting router advertisements unless specifically requested */ |
