summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-03-01 23:40:32 +0000
committerErmal <eri@pfsense.org>2011-03-01 23:40:32 +0000
commit05c4bfa003a5013af31dcd3a59a20a682c93fb8f (patch)
tree745ed0484e3d45d2ce4a4172fde22dcb1343d67f /etc
parentc84876040a6669f5cb01c3772e861ba2084110f5 (diff)
downloadpfsense-05c4bfa003a5013af31dcd3a59a20a682c93fb8f.zip
pfsense-05c4bfa003a5013af31dcd3a59a20a682c93fb8f.tar.gz
Pass the -a parameters to pgrep to be certain we search ancestors as well. The side effects might be inoquos from the pfSense context.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc2
-rw-r--r--etc/inc/interfaces.inc2
-rw-r--r--etc/inc/service-utils.inc4
-rw-r--r--etc/inc/services.inc4
-rw-r--r--etc/inc/util.inc2
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 5f721ff..e0ddd9a 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -124,7 +124,7 @@ function filter_pflog_start() {
}
mute_kernel_msgs();
$output = 0;
- exec("/bin/pgrep -f 'tcpdump -s 256 -v -l -n -e -ttt -i pflog0'", $output, $retval);
+ exec("/bin/pgrep -af 'tcpdump -s 256 -v -l -n -e -ttt -i pflog0'", $output, $retval);
if($retval != 0)
mwexec_bg("/usr/sbin/tcpdump -s 256 -v -l -n -e -ttt -i pflog0 | logger -t pf -p local0.info");
unmute_kernel_msgs();
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 27dc9d6..2533201 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2469,7 +2469,7 @@ function kill_wpasupplicant($interface) {
function find_dhclient_process($interface) {
if ($interface)
- $pid = `/bin/pgrep -xf "dhclient: {$interface}"`;
+ $pid = `/bin/pgrep -axf "dhclient: {$interface}"`;
else
$pid = 0;
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 3588953..895eb57 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -34,7 +34,7 @@
*/
/*
- pfSense_BUILDER_BINARIES: /bin/pkill /bin/pgrep /bin/sh /usr/bin/killall
+ pfSense_BUILDER_BINARIES: /bin/pgrep /bin/sh /usr/bin/killall
pfSense_MODULE: utils
*/
@@ -207,4 +207,4 @@ function is_service_running($service, $ps = "") {
return false;
}
-?> \ No newline at end of file
+?>
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 74c923c..c01d97d 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -32,7 +32,7 @@
*/
/*
- pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy
+ pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/pgrep /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy
pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/sbin/arp /sbin/ifconfig /usr/local/sbin/dnsmasq
pfSense_BUILDER_BINARIES: /usr/sbin/bsnmpd /sbin/route /usr/local/sbin/olsrd
pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd
@@ -1308,7 +1308,7 @@ function upnp_action ($action) {
mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf');
break;
case "stop":
- while((int)exec("pgrep miniupnpd | wc -l") > 0)
+ while((int)exec("/bin/pgrep -a miniupnpd | wc -l") > 0)
mwexec('killall miniupnpd 2>/dev/null', true);
mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 2dbf3ef..eb92a95 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -50,7 +50,7 @@ function isvalidpid($pid) {
function is_process_running($process) {
$output = "";
- exec("/bin/pgrep -x {$process}", $output, $retval);
+ exec("/bin/pgrep -ax {$process}", $output, $retval);
return (intval($retval) == 0);
}
OpenPOWER on IntegriCloud