diff options
| author | Scott Ullrich <sullrich@G5.local> | 2009-10-25 19:24:10 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@G5.local> | 2009-10-25 19:24:10 -0400 |
| commit | ec054b7cc433ccb23c95b725ed31ce25f9be01ba (patch) | |
| tree | 01ac6198b37aefef398143411efc9c7a713fdf35 | |
| parent | 891546ea85bdc3d2a41694bce791f9b91fc9fe2c (diff) | |
| download | pfsense-ec054b7cc433ccb23c95b725ed31ce25f9be01ba.zip pfsense-ec054b7cc433ccb23c95b725ed31ce25f9be01ba.tar.gz | |
s/interface_bring_up/interfaces_bring_up/
| -rw-r--r-- | etc/inc/interfaces.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index a899983..4a38327 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -46,8 +46,8 @@ require_once("globals.inc"); function interfaces_bring_up($interface) { if(!$interface) { - log_error("bring_interface_up was called but no variable defined."); - log_error( "Backtrace: " . var_dump(debug_backtrace()) ); + log_error("interfaces_bring_up() was called but no variable defined."); + log_error( "Backtrace: " . debug_backtrace() ); return; } mwexec("/sbin/ifconfig " . escapeshellarg($interface) . " up"); @@ -1226,7 +1226,7 @@ function interface_carpdev_configure(&$vip) { $vipif = "vip" . $vip['vhid']; $realif = interface_translate_type_to_real($vip['interface']); - interface_bring_up($realif); + interfaces_bring_up($realif); /* * ensure the interface containing the VIP really exists * prevents a panic if the interface is missing or invalid @@ -1244,7 +1244,7 @@ function interface_carpdev_configure(&$vip) { } mwexec("/sbin/ifconfig {$vipif} carpdev {$realif} vhid {$vip['vhid']} advskew {$vip['advskew']} {$password}"); - interface_bring_up($vipif); + interfaces_bring_up($vipif); /* * XXX: BIG HACK but carpdev needs ip services active @@ -1668,7 +1668,7 @@ function interface_configure($interface = "wan", $reloadall = false) { file_put_contents("/tmp/{$realif}_router", $wancfg['gateway']); } if($wancfg['if']) - interfaces_bring_up(get_real_interface($wancfg['if'])); + interfaces_bring_up(get_real_interface(get_real_interface($wancfg['if']))); else log_error("Could not bring wancfg['if'] up -- variable not defined in interface_configure()"); @@ -1792,7 +1792,7 @@ EOD; /* bring wan interface up before starting dhclient */ if($realwanif) - interfaces_bring_up($realwanif); + interfaces_bring_up(get_real_interface($realwanif)); else log_error("Could not bring realwanif up in interface_dhcp_configure()"); @@ -1951,7 +1951,7 @@ EOD; /* Bring the parent interface up */ if($wancfg['if']) - interfaces_bring_up($wancfg['if']); + interfaces_bring_up(get_real_interface($wancfg['if'])); else log_error("Could not bring wancfg['if'] up in interface_pppoe_configure()"); |
