Revision: 5836
http://ipcop.svn.sourceforge.net/ipcop/?rev=5836&view=rev
Author: owes
Date: 2011-09-03 11:06:21 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Fix path used for br2684ctl, fixes using pulsar DSL.
Tweak use of debugging in rc.pulsardsl.
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.pulsardsl
ipcop/trunk/src/rc.d/rc.red
ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21
Modified: ipcop/trunk/src/rc.d/rc.pulsardsl
===================================================================
--- ipcop/trunk/src/rc.d/rc.pulsardsl 2011-09-01 20:44:42 UTC (rev 5835)
+++ ipcop/trunk/src/rc.d/rc.pulsardsl 2011-09-03 11:06:21 UTC (rev 5836)
@@ -1,16 +1,35 @@
#!/bin/bash
#
+# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (c) 2002-2011 The IPCop Team
+#
# $Id$
#
+DEBUG="off"
eval $(/usr/local/bin/readhash /var/ipcop/ppp/settings)
PULSARFS='/proc/driver/pulsar'
-# Debugging. Comment it out to stop logging
-DEBUG="yes"
+# Debugging. Comment it out to use DEBUG from ppp settings
+DEBUG="on"
+
msg() {
- if [ "z$DEBUG" != "z" ] ; then
+ if [ "$DEBUG" -eq "on" ] ; then
/usr/bin/logger -t red "Pulsar DSL: $*"
fi
echo "$*"
Modified: ipcop/trunk/src/rc.d/rc.red
===================================================================
--- ipcop/trunk/src/rc.d/rc.red 2011-09-01 20:44:42 UTC (rev 5835)
+++ ipcop/trunk/src/rc.d/rc.red 2011-09-03 11:06:21 UTC (rev 5836)
@@ -69,7 +69,7 @@
# complete cleanup only if settings were changed or clear is ordered
system('/sbin/modprobe', '-r', 'pppoatm');
system('/sbin/modprobe', '-r', 'pppoe');
- system('/usr/bin/killall /usr/bin/br2684ctl 2>/dev/null');
+ system('/usr/bin/killall /usr/sbin/br2684ctl 2>/dev/null');
system('/sbin/modprobe', '-r', 'br2684');
system('/sbin/modprobe', '-r', 'clip');
@@ -1116,7 +1116,7 @@
$netsettings{'RED_1_DEV'} = $device;
if (system('/bin/ps -ef | /bin/grep -q [b]r2684ctl')) {
system('/sbin/modprobe br2684');
- system('/usr/bin/br2684ctl', '-b', '-c', "$itf", '-e',
$pppsettings{'ENCAP'}, '-a',
+ system('/usr/sbin/br2684ctl', '-b', '-c', "$itf", '-e',
$pppsettings{'ENCAP'}, '-a',
"$itf.$pppsettings{'VPI'}.$pppsettings{'VCI'}");
sleep 3;
}
@@ -1129,7 +1129,7 @@
if (open(FILE, ">/var/ipcop/red/iface")) { print FILE $iface;
close FILE; }
if (system('/bin/ps -ef | /bin/grep -q [b]r2684ctl')) {
system('/sbin/modprobe br2684');
- system('/usr/bin/br2684ctl', '-b', '-c', "$itf", '-e',
$pppsettings{'ENCAP'}, '-a',
+ system('/usr/sbin/br2684ctl', '-b', '-c', "$itf", '-e',
$pppsettings{'ENCAP'}, '-a',
"$itf.$pppsettings{'VPI'}.$pppsettings{'VCI'}");
sleep 3;
}
Modified: ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21
===================================================================
--- ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21 2011-09-01 20:44:42 UTC
(rev 5835)
+++ ipcop/trunk/updates/1.9.21/ROOTFILES.i486-1.9.21 2011-09-03 11:06:21 UTC
(rev 5836)
@@ -1,5 +1,7 @@
## please place IPCop files first, then packages sorted by alphabetical order
/etc/rc.d/rc.firewall
+/etc/rc.d/rc.pulsardsl
+/etc/rc.d/rc.red
/home/httpd/cgi-bin/email.cgi
/home/httpd/cgi-bin/proxy.cgi
/usr/local/bin/emailhelper
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
