Revision: 7292
http://sourceforge.net/p/ipcop/svn/7292
Author: owes
Date: 2014-03-06 13:14:25 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
Use pidof from procps and no longer from sysvinit
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/procps
ipcop/trunk/src/scripts/vpn-watch
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/setup
Modified: ipcop/trunk/config/rootfiles/common/procps
===================================================================
--- ipcop/trunk/config/rootfiles/common/procps 2014-03-06 13:12:09 UTC (rev
7291)
+++ ipcop/trunk/config/rootfiles/common/procps 2014-03-06 13:14:25 UTC (rev
7292)
@@ -4,7 +4,7 @@
sbin/sysctl
usr/bin/free
#usr/bin/pgrep
-#usr/bin/pidof
+usr/bin/pidof
#usr/bin/pkill
#usr/bin/pmap
#usr/bin/pwdx
Modified: ipcop/trunk/src/scripts/vpn-watch
===================================================================
--- ipcop/trunk/src/scripts/vpn-watch 2014-03-06 13:12:09 UTC (rev 7291)
+++ ipcop/trunk/src/scripts/vpn-watch 2014-03-06 13:14:25 UTC (rev 7292)
@@ -71,13 +71,13 @@
'stop' | '--stop')
# Terminate processes
- for proc in $(/bin/pidof -x -o %PPID $(basename $0)); do
+ for proc in $(/usr/bin/pidof -x -o %PPID $(basename $0)); do
/bin/kill -s SIGTERM "$proc"
done
/bin/sleep 1
# Kill remaining processes
- for proc in $(/bin/pidof -x -o %PPID $(basename $0)); do
+ for proc in $(/usr/bin/pidof -x -o %PPID $(basename $0)); do
/bin/kill -s SIGKILL "$proc"
done
/bin/rm -f "/var/run/$(basename $0)" # Remove pipe
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-06 13:12:09 UTC
(rev 7291)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-06 13:14:25 UTC
(rev 7292)
@@ -2,6 +2,7 @@
/home/httpd/cgi-bin/logproxy.cgi
/home/httpd/cgi-bin/proxy.cgi
/home/httpd/cgi-bin/urlfilter.cgi
+/usr/local/bin/vpn-watch
/usr/share/locale/el_GR/LC_MESSAGES/ipcop.mo
/usr/share/locale/tr_TR/LC_MESSAGES/ipcop.mo
##
@@ -114,6 +115,7 @@
/bin/ps
/sbin/sysctl
/usr/bin/free
+/usr/bin/pidof
/usr/bin/top
/usr/bin/uptime
/usr/bin/vmstat
Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup 2014-03-06 13:12:09 UTC (rev 7291)
+++ ipcop/trunk/updates/2.1.3/setup 2014-03-06 13:14:25 UTC (rev 7292)
@@ -78,6 +78,9 @@
/bin/rm -f /lib/libprocps.so.1
/bin/rm -f /lib/libprocps.so.1.1.2
+# pidof now in /usr/bin
+/bin/rm -f /bin/pidof
+
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
