diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2006-12-22 16:55:57 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2006-12-22 16:55:57 +0000 |
| commit | fda8dc28ecc03307df20a2550b3b8e40eefebb5e (patch) | |
| tree | 4ab270eff9cb6b3664dfa57b41d99285a9808e42 /etc/inc/service-utils.inc | |
| parent | bd18ec7c467169a696fe296aeee8744f096614f3 (diff) | |
| download | pfsense-fda8dc28ecc03307df20a2550b3b8e40eefebb5e.zip pfsense-fda8dc28ecc03307df20a2550b3b8e40eefebb5e.tar.gz | |
Fix DHCP status on status_interfaces.php. Use find_dhclient_process() for test.
Diffstat (limited to 'etc/inc/service-utils.inc')
| -rw-r--r-- | etc/inc/service-utils.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 8c6871d..d869819 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -143,11 +143,12 @@ 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); - $status = `/bin/ps ax | /usr/bin/grep dhclient | grep $interface | grep -v grep | wc -l`; - if($status > 0) return 1; - return 0; + if(filter_translate_type_to_real_interface($interface) <> "") + $interface = filter_translate_type_to_real_interface($interface); + $status = find_dhclient_process($interface); + if($status <> "") + return 1; + return 0; } function restart_service_if_running($service) { @@ -181,4 +182,4 @@ function is_service_running($service, $ps = "") { } } -?>
\ No newline at end of file +?> |
