diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-09-09 11:08:02 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-09-09 11:08:02 +0000 |
commit | 69e5a8be8dd049725b4df12aed425300a2a041e8 (patch) | |
tree | b71bd2aa7346c346b8f92dc6fb927195926a3269 /etc | |
parent | e1bce2c5d715c97e5f57e880c1543fc239aadf45 (diff) | |
download | pfsense-69e5a8be8dd049725b4df12aed425300a2a041e8.zip pfsense-69e5a8be8dd049725b4df12aed425300a2a041e8.tar.gz |
Rename interfaces_wan_configure to interface_configure now that it is used for all assigned interface configuration.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/interfaces.inc | 4 | ||||
-rwxr-xr-x | etc/rc.initial.setlanip | 2 | ||||
-rwxr-xr-x | etc/rc.interfaces_lan_configure | 2 | ||||
-rwxr-xr-x | etc/rc.interfaces_wan_configure | 2 | ||||
-rwxr-xr-x | etc/rc.linkup | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index ee41990..39d7720 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -423,7 +423,7 @@ function interfaces_configure() { if($debug) log_error("Configuring {$ifname}"); - interfaces_wan_configure($if); + interface_configure($if); if ($g['booting']) echo "done.\n"; @@ -1002,7 +1002,7 @@ function find_dhclient_process($interface) { return $pid; } -function interfaces_wan_configure($interface = "wan") { +function interface_configure($interface = "wan") { global $config, $g; $wancfg = $config['interfaces'][$interface]; diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 609e722..9c0bd81 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -206,7 +206,7 @@ $upperifname = strtoupper($interface); echo "\nPlease wait, saving and activating your changes to {$upperifname}..."; write_config(gettext("{$interface} IP configuration from console menu")); - interfaces_wan_configure("lan"); + interface_configure("lan"); echo " Reloading filter..."; filter_configure_sync(); echo "\n"; diff --git a/etc/rc.interfaces_lan_configure b/etc/rc.interfaces_lan_configure index 0ee2d5b..7eb5a6e 100755 --- a/etc/rc.interfaces_lan_configure +++ b/etc/rc.interfaces_lan_configure @@ -32,6 +32,6 @@ require_once("config.inc"); require_once("filter.inc"); -interfaces_wan_configure("lan"); +interface_configure("lan"); ?> diff --git a/etc/rc.interfaces_wan_configure b/etc/rc.interfaces_wan_configure index 1d3914e..505c3ab 100755 --- a/etc/rc.interfaces_wan_configure +++ b/etc/rc.interfaces_wan_configure @@ -32,6 +32,6 @@ require_once("config.inc"); require_once("filter.inc"); -interfaces_wan_configure(); +interface_configure("wan"); ?> diff --git a/etc/rc.linkup b/etc/rc.linkup index 262cc20..3afbba4 100755 --- a/etc/rc.linkup +++ b/etc/rc.linkup @@ -84,7 +84,7 @@ $config['interfaces'][$iface]['ipaddr'] <> "pptp") { /* do not reconfigure on hotplug events when using pppoe or pptp */ log_error("HOTPLUG: Configuring wan interface {$argument1}"); - interfaces_wan_configure($iface); + interface_configure($iface); } } } |