aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@gmail.com>2012-02-20 13:26:25 -0800
committerScott Ullrich <sullrich@gmail.com>2012-02-20 13:26:25 -0800
commitda2ef840410ff50354b30c1deddda08dd325e34b (patch)
treec7c565a540473fdf35bbd90402f105f83b7a80c7
parentcaf4f70c57b80e10be3950c4e394c7a4a965cb89 (diff)
parent48f2c6854fd11937f21fc6cf409e3eb16ce66958 (diff)
downloadpfsense-packages-da2ef840410ff50354b30c1deddda08dd325e34b.tar.gz
pfsense-packages-da2ef840410ff50354b30c1deddda08dd325e34b.tar.bz2
pfsense-packages-da2ef840410ff50354b30c1deddda08dd325e34b.zip
Merge pull request #216 from mdima/master
LCDProc: Again on the service start/stop/restart
-rw-r--r--config/lcdproc-dev/lcdproc.inc4
-rw-r--r--config/lcdproc-dev/lcdproc.xml4
-rw-r--r--config/lcdproc-dev/lcdproc_client.php6
-rw-r--r--config/lcdproc-dev/lcdproc_screens.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
6 files changed, 9 insertions, 11 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 4034248d..fc91dd8a 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -503,17 +503,15 @@
while [ `ps auxw |awk '/lcdproc_client.ph[p]/ {print $2}'| wc -l` != 0 ];
do
ps auxw |awk '/lcdproc_client.ph[p]/ {print $2}'|xargs kill
- sleep 2
done
while [ `ps auxw |awk '/LCD[d]/ {print $2}'| wc -l` != 0 ];
do
ps auxw |awk '/LCD[d]/ {print $2}'|xargs kill
- sleep 2
done
EOD;
$start = $stop ."\n";
$start .= "\t/usr/bin/nice -20 /usr/local/sbin/LCDd -c ". LCDPROC_CONFIG ."\n";
- $start .= "\t/usr/bin/nice -20 /usr/local/bin/php -f /usr/local/pkg/lcdproc_client.php\n";
+ $start .= "\t/usr/bin/nice -20 /usr/local/bin/php -f /usr/local/pkg/lcdproc_client.php &\n";
/* write out the configuration */
conf_mount_rw();
lcdproc_write_config(LCDPROC_CONFIG, $config_text);
diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml
index b077250f..7b59bce0 100644
--- a/config/lcdproc-dev/lcdproc.xml
+++ b/config/lcdproc-dev/lcdproc.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<packagegui>
- <title>Services: LCDproc 0.5.5 pkg v. 0.9.3</title>
+ <title>Services: LCDproc 0.5.5 pkg v. 0.9.4</title>
<name>lcdproc</name>
- <version>0.5.5 pkg v. 0.9.3</version>
+ <version>0.5.5 pkg v. 0.9.4</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php
index 684a645f..6050b6ca 100644
--- a/config/lcdproc-dev/lcdproc_client.php
+++ b/config/lcdproc-dev/lcdproc_client.php
@@ -42,15 +42,15 @@
if (isset($config['system']['maximumstates']) and $config['system']['maximumstates'] > 0)
$maxstates="/{$config['system']['maximumstates']}";
else
- $maxstates="/10000";
-
+ $maxstates="/". pfsense_default_state_size();
+
$curentries = `/sbin/pfctl -si |grep current`;
if (preg_match("/([0-9]+)/", $curentries, $matches)) {
$curentries = $matches[1];
}
return $curentries . $maxstates;
}
-
+
function disk_usage() {
$dfout = "";
exec("/bin/df -h | /usr/bin/grep -w '/' | /usr/bin/awk '{ print $5 }' | /usr/bin/cut -d '%' -f 1", $dfout);
diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml
index da064e9e..f7c70086 100644
--- a/config/lcdproc-dev/lcdproc_screens.xml
+++ b/config/lcdproc-dev/lcdproc_screens.xml
@@ -2,7 +2,7 @@
<packagegui>
<title>Services: LCDproc: Screens</title>
<name>lcdproc_screens</name>
- <version>0.5.5 pkg v. 0.9.3</version>
+ <version>0.5.5 pkg v. 0.9.4</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 131c28a6..09688bb5 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1023,7 +1023,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg v. 0.9.3</version>
+ <version>lcdproc-0.5.5 pkg v. 0.9.4</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 5a8f3c5f..60b28dce 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -989,7 +989,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg v. 0.9.3</version>
+ <version>lcdproc-0.5.5 pkg v. 0.9.4</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>