Revision: 5010
http://ipcop.svn.sourceforge.net/ipcop/?rev=5010&view=rev
Author: owes
Date: 2010-10-15 09:18:35 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Block/Wait reconnecting when rc.updatered is still active
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.red
ipcop/trunk/src/scripts/scheduler.pl
ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
Modified: ipcop/trunk/src/rc.d/rc.red
===================================================================
--- ipcop/trunk/src/rc.d/rc.red 2010-10-15 08:52:10 UTC (rev 5009)
+++ ipcop/trunk/src/rc.d/rc.red 2010-10-15 09:18:35 UTC (rev 5010)
@@ -102,6 +102,10 @@
&General::log("ERROR: Can't start RED when it's still active");
exit 1;
}
+ if (! system("/bin/ps ax | /bin/grep -q [r]c.updatered") ) {
+ &General::log("ERROR: Can't start RED when rc.updatered is still
active");
+ exit 1;
+ }
if (
(
Modified: ipcop/trunk/src/scripts/scheduler.pl
===================================================================
--- ipcop/trunk/src/scripts/scheduler.pl 2010-10-15 08:52:10 UTC (rev
5009)
+++ ipcop/trunk/src/scripts/scheduler.pl 2010-10-15 09:18:35 UTC (rev
5010)
@@ -110,6 +110,11 @@
while (-e '/var/ipcop/red/active' || -d "/proc/$ppppid") {
sleep 1;
}
+
+ # Wait for rc.updatered to finish
+ while (! system("/bin/ps ax | /bin/grep -q [r]c.updatered") ) {
+ sleep 1;
+ }
}
sub profile
Modified: ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
===================================================================
--- ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-10-15 08:52:10 UTC
(rev 5009)
+++ ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-10-15 09:18:35 UTC
(rev 5010)
@@ -1,9 +1,11 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/etc/rc.d/rc.red
/home/httpd/cgi-bin/logsystem.cgi
/home/httpd/cgi-bin/sysinfo.cgi
/home/httpd/cgi-bin/status.cgi
/home/httpd/cgi-bin/updates.cgi
/usr/local/bin/dhcpcd.sh
+/usr/local/bin/scheduler.pl
/usr/share/locale/fr_FR/LC_MESSAGES/ipcop.mo
##
## dhcpcd-5.2.8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
