summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-11-07 19:18:11 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-11-07 19:18:11 +0000
commitea7b1502f376e80a23bb3a484fb6b6e31a98ce4a (patch)
tree5db2b40b4113cf81d169810928a6bac63fa09b22 /etc/inc/config.inc
parentc50f8cb05f7e564f3b96dbf43720585871772c83 (diff)
downloadpfsense-ea7b1502f376e80a23bb3a484fb6b6e31a98ce4a.zip
pfsense-ea7b1502f376e80a23bb3a484fb6b6e31a98ce4a.tar.gz
MFC 7455
Cleanup ps checks. Submitted-by: Dan Swartzendruber <dswartz_AT_druber.com>
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 8e329f8..abc5d22 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1209,7 +1209,7 @@ function system_start_ftp_helpers() {
* keep processing interfaces. kill pftpx if already
* running for this instance.
*/
- $helpers = exec("ps aux | grep \"/usr/local/sbin/pftpx -g 8021\" | grep -v grep | cut -d\" \" -f6");
+ $helpers = exec("ps ax | grep \"/usr/local/sbin/pftpx -c {$port}\" | grep -v grep | sed \"s/ */ /g\" | cut -f2 -d\" \"");
mwexec("/usr/bin/kill {$helpers}");
$interface_counter++;
continue;
@@ -1217,7 +1217,7 @@ function system_start_ftp_helpers() {
/* grab the current interface IP address */
$ip = find_interface_ip(convert_friendly_interface_to_real_interface_name($ifname));
/* if pftpx is already running then do not launch it again */
- $helpers = exec("ps aux | grep \"/usr/local/sbin/pftpx -c {$port} -g 8021\" | grep -v grep | grep {$ip}");
+ $helpers = exec("ps ax | grep \"/usr/local/sbin/pftpx -c {$port}\" | grep -v grep | grep {$ip}");
if(!$helpers)
mwexec("/usr/local/sbin/pftpx -c {$port} -g 8021 {$ip}");
$interface_counter++;
OpenPOWER on IntegriCloud