[Astlinux-commits] SF.net SVN: astlinux: [248] trunk/package/iptables

[<kr...@us...>]

Revision: 248
Author:   krisk84
Date:     2006-08-13 18:44:34 -0700 (Sun, 13 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=248&view=rev

Log Message:
-----------
more small arno/astfw/iptables fixes

Modified Paths:
--------------
    trunk/package/iptables/iptables.init
    trunk/target/generic/target_skeleton/stat/etc/rc.conf
    trunk/target/generic/target_skeleton/usr/sbin/genkd
Modified: trunk/package/iptables/iptables.init
===================================================================
--- trunk/package/iptables/iptables.init	2006-08-14 01:13:14 UTC (rev 247)
+++ trunk/package/iptables/iptables.init	2006-08-14 01:44:34 UTC (rev 248)
@@ -5,24 +5,47 @@
 start () {
 if [ "$INTIF" ]
 then
-if [ "$FWVERS" = "arno" ]
+
+if [ ! -x /usr/sbin/iptables ]
 then
+echo "You don't have iptables installed."
+exit 1
+fi
+
+if [ "$FWVERS" -a "$FWVERS" = "arno" ]
+then
+
+if [ -x /usr/sbin/arno-iptables-firewall ]
 /usr/sbin/arno-iptables-firewall start
 else
+echo "You don't have arno iptables firewall installed"
+fi
+
+else
 echo "Starting iptables..."
+
 if [ -x /mnt/kd/astfw ]
 then
 /mnt/kd/astfw
 else
 /usr/sbin/astfw
 fi
+
 fi
+
 fi
 }
 
 stop () {
 if [ "$INTIF" ]
 then
+
+if [ ! -x /usr/sbin/iptables ]
+then
+echo "You don't have iptables installed."
+exit 1
+fi
+
 if [ "$FWVERS" = "arno" ]
 then
 /usr/sbin/arno-iptables-firewall stop

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-08-14 01:13:14 UTC (rev 247)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-08-14 01:44:34 UTC (rev 248)
@@ -152,14 +152,13 @@
 #PPOEIF="w1ad"
 PPPOEKERNEL="YES"
 
-### Firewall support.  Two firewall scripts are now included.  Set that variable
+### Firewall support.  Two firewall scripts are now available.  Set that variable
 ### here.  Values are astfw or arno.  If not set, defaults to astfw.
 ### Settings for Arno's firewall should be made by copying the config file from 
 ### /stat/etc/arno-iptables-firewall.conf to /mnt/kd.  REBOOT or restart iptables
 ### If using Arno's firewall, the firewall settings in rc.conf are presently ignored.
+FWVERS="astfw"
 
-FWVERS=
-
 ### astfw Firewall (iptables)
 
 ##If you have more than one IP on the EXTIF, here is where you configure 1:1 NAT maps

Modified: trunk/target/generic/target_skeleton/usr/sbin/genkd
===================================================================
--- trunk/target/generic/target_skeleton/usr/sbin/genkd	2006-08-14 01:13:14 UTC (rev 247)
+++ trunk/target/generic/target_skeleton/usr/sbin/genkd	2006-08-14 01:44:34 UTC (rev 248)
@@ -98,7 +98,6 @@
 touch /mnt/kd/dnsmasq.leases
 fi
 
-cp -a /usr/sbin/astfw /mnt/kd/
 cp -a /var/log/asterisk/cdr-csv /mnt/kd/
 cp -a /stat/etc/wanpipe /mnt/kd/
 cp -a /var/spool/cron/crontabs /mnt/kd/
@@ -110,5 +109,17 @@
 touch /mnt/kd/astdb
 fi
 
+if [ "$FWVERS" -a "$FWVERS" = "arno" ]
+then
+
+if [ -f /stat/etc/arno-iptables-firewall.conf ]
+then
+cp -a /stat/etc/arno-iptables-firewall.conf /mnt/kd/
+else
+echo "You haven't installed the arno iptables firewall."
+fi
+
+fi
+
 echo "Done.  I STRONGLY URGE YOU TO REBOOT NOW."
 echo "Type reboot to cleanly restart now."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.