diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-12-23 00:00:28 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-12-23 00:00:28 +0000 |
| commit | ca88e48ff17d7e5e2a7d5968ae9730c92bdff724 (patch) | |
| tree | 8c1b8ff6bfe2e3e0ccf59913fc36ede84a9212eb /etc/inc/service-utils.inc | |
| parent | f1d5b72c4130de3511c302e5e3fc34914a3003de (diff) | |
| download | pfsense-ca88e48ff17d7e5e2a7d5968ae9730c92bdff724.zip pfsense-ca88e48ff17d7e5e2a7d5968ae9730c92bdff724.tar.gz | |
* Fix release / renew
* Don't return immediately from dhclient to give it time to associate so we can return correct address back to status_interfaces.php
Diffstat (limited to 'etc/inc/service-utils.inc')
| -rw-r--r-- | etc/inc/service-utils.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index d869819..01d2714 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -143,12 +143,11 @@ function is_process_running($process) { } function is_dhcp_running($interface) { - if(filter_translate_type_to_real_interface($interface) <> "") - $interface = filter_translate_type_to_real_interface($interface); + $interface = convert_friendly_interface_to_real_interface_name($interface); $status = find_dhclient_process($interface); if($status <> "") - return 1; - return 0; + return true; + return false; } function restart_service_if_running($service) { @@ -182,4 +181,4 @@ function is_service_running($service, $ps = "") { } } -?> +?>
\ No newline at end of file |
