summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-12-08 13:51:38 +0000
committerErmal Luçi <eri@pfsense.org>2008-12-08 13:51:38 +0000
commitfaab50d4a24cdd4f614813a2ba110554d8be4f74 (patch)
tree6cdffe8bdf9154042e32a984a9b21e68457439ce
parentb55307bfb8b5f228b9827a31fdeb038cdf71d5a7 (diff)
downloadpfsense-faab50d4a24cdd4f614813a2ba110554d8be4f74.zip
pfsense-faab50d4a24cdd4f614813a2ba110554d8be4f74.tar.gz
Fix the {interface}up checks.
-rw-r--r--etc/inc/interfaces.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index f772b18..23a5ca6 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -602,7 +602,7 @@ function interface_bring_down($interface = "wan", $destroy = false) {
mwexec("/usr/sbin/arp -d -i {$realif} -a");
/* remove interface up file if it exists */
- unlink_if_exists("{$g['tmp_path']}/{$interface}up");
+ unlink_if_exists("{$g['tmp_path']}/{$realif}up");
unlink_if_exists("{$g['vardb_path']}/{$interface}ip");
//unlink_if_exists("{$g['varetc_path']}/nameservers.conf");
@@ -1628,13 +1628,13 @@ EOD;
/* sleep until wan is up - or 30 seconds, whichever comes first */
for ($count = 0; $count < 30; $count++) {
- if(file_exists("{$g['tmp_path']}/{$interface}up")) {
+ if(file_exists("{$g['tmp_path']}/{$realif}up")) {
break;
}
sleep(1);
}
- unlink_if_exists("{$g['tmp_path']}/{$interface}up");
+ unlink_if_exists("{$g['tmp_path']}/{$realif}up");
return 0;
}
OpenPOWER on IntegriCloud