aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@dds.nl>2012-02-01 14:15:00 -0800
committerSeth Mos <seth.mos@dds.nl>2012-02-01 14:15:00 -0800
commitcc9fefcc5249ab98f845d511833461a2400846c0 (patch)
tree85afd428c8451234b81abdd6d0779197b7832422
parentc424326c18b13fc0d8a78bb6ddf4589f4bdbc4a3 (diff)
parent2bb724fbd70daf03b6e94563ba509bd32355d7fd (diff)
downloadpfsense-packages-cc9fefcc5249ab98f845d511833461a2400846c0.tar.gz
pfsense-packages-cc9fefcc5249ab98f845d511833461a2400846c0.tar.bz2
pfsense-packages-cc9fefcc5249ab98f845d511833461a2400846c0.zip
Merge pull request #208 from mdima/master
Kills explicitly the clients on the package resync
-rw-r--r--config/lcdproc-dev/lcdproc.inc4
-rw-r--r--config/lcdproc-dev/lcdproc.xml4
-rw-r--r--config/lcdproc-dev/lcdproc_screens.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 9 insertions, 5 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 7617e168..0f40be53 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -512,6 +512,10 @@ if [ `ps auxw |awk '/lcdclient.s[h]/ {print $2}'| wc -l` != 0 ]; then
ps auxw |awk '/lcdclient.s[h]/ {print $2}'|xargs kill -9
sleep 1
fi
+if [ `ps auxw |awk '/lcdproc_client.ph[p]/ {print $2}'| wc -l` != 0 ]; then
+ ps auxw |awk '/lcdproc_client.ph[p]/ {print $2}'|xargs kill -9
+ sleep 1
+fi
if [ `ps auxw |awk '/LCD[d]/ {print $2}'| wc -l` != 0 ]; then
ps auxw |awk '/LCD[d]/ {print $2}'|xargs kill -9
sleep 1
diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml
index 0ef98694..07d19816 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.1</title>
+ <title>Services: LCDproc 0.5.5 pkg v. 0.9.2</title>
<name>lcdproc</name>
- <version>0.5.5 pkg v. 0.9.1</version>
+ <version>0.5.5 pkg v. 0.9.2</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml
index 3dfe4b75..46bde743 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.1</version>
+ <version>0.5.5 pkg v. 0.9.2</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 4597463e..e2c4fbdc 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.1</version>
+ <version>lcdproc-0.5.5 pkg v. 0.9.2</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 9dfcee33..4d0b934b 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.1</version>
+ <version>lcdproc-0.5.5 pkg v. 0.9.2</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>