summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-03-07 02:19:04 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-03-07 02:19:04 +0000
commitfa35df122d46421247e76d164a92d29f5dc013cc (patch)
treef20bdf6eba546ae2922a0f5e5675f714bd34b6b4 /etc
parente93903c7b6b1a404418c3aa5ae0f55dcd82d28e1 (diff)
downloadpfsense-fa35df122d46421247e76d164a92d29f5dc013cc.zip
pfsense-fa35df122d46421247e76d164a92d29f5dc013cc.tar.gz
* Full path to killall
* Extra i in regex
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 4edabef..df38cad 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -553,7 +553,7 @@ function resync_all_package_configs_bootup($show_message) {
if($pkg_config['additional_files_needed'] != "") {
foreach($pkg_config['additional_files_needed']['item'] as $item) {
$pkg_name = strrchr($item, "/");
- if(!preg_match("/.xml/i", $pkg_name)) break;
+ if(!preg_match("/\.xml/", $pkg_name)) break;
if(!file_exists("/usr/local/pkg/" . $pkg_name)) {
if($show_message == true) print "Fetching " . $pkg_name . ".\n";
log_error("Fetching missing configuration XML for " . $pkg_name);
@@ -578,11 +578,11 @@ function sweep_package_processes() {
foreach($config['installedpackages']['package'] as $package) {
$pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui");
if($pkg_config['swept_processes'] <> "") {
- mwexec("killall" . $pkg_config['swept_processes']);
+ mwexec("/usr/bin/killall " . $pkg_config['swept_processes']);
log_error("Killed " . $package['name'] . "'s unnecessary processes.");
- }
+ }
}
-}
+}
/*
* gather_altq_queue_stats(): gather alq queue stats and return an array that
@@ -614,4 +614,5 @@ function gather_altq_queue_stats($dont_return_root_queues) {
}
return $queue_stats;
}
-?>
+
+?> \ No newline at end of file
OpenPOWER on IntegriCloud