Merge branch 'master' into install-raid

Conflicts:
	config/rootfiles/common/bash
	lfs/bash

src/initscripts/init.d/firewall

@@ -104,6 +104,12 @@ iptables_init() {
 	iptables -t nat -N CUSTOMPOSTROUTING
 	iptables -t nat -A POSTROUTING -j CUSTOMPOSTROUTING
 
+	# P2PBLOCK
+	iptables -N P2PBLOCK
+	iptables -A INPUT -j P2PBLOCK
+	iptables -A FORWARD -j P2PBLOCK
+	iptables -A OUTPUT -j P2PBLOCK
+	
 	# Guardian (IPS) chains
 	iptables -N GUARDIAN
 	iptables -A INPUT -j GUARDIAN
@@ -402,21 +408,11 @@ case "$1" in
 	boot_mesg "Setting up firewall"
 	iptables_init
 	evaluate_retval
-
-	# run local firewall configuration, if present
-	if [ -x /etc/sysconfig/firewall.local ]; then
-		/etc/sysconfig/firewall.local start
-	fi
 	;;
   reload|up)
 	boot_mesg "Reloading firewall"
 	iptables_red_up
 	evaluate_retval
-
-	# run local firewall configuration, if present
-	if [ -x /etc/sysconfig/firewall.local ]; then
-		/etc/sysconfig/firewall.local reload
-	fi
 	;;
   down)
 	boot_mesg "Disabling firewall access to RED"
@@ -424,10 +420,6 @@ case "$1" in
 	evaluate_retval
 	;;
   restart)
-	# run local firewall configuration, if present
-	if [ -x /etc/sysconfig/firewall.local ]; then
-		/etc/sysconfig/firewall.local stop
-	fi
 	$0 start
 	;;
   *)

src/initscripts/init.d/network

@@ -18,7 +18,6 @@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 init_networking() {
 	/etc/rc.d/init.d/dnsmasq start
-	/etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"
@@ -26,7 +25,7 @@ shift
 
 if [ -n "${1}" ]; then
 	ALL=0
-	for i in green red blue orange; do      
+	for i in green red blue orange; do
 		eval "${i}=0"
 	done
 else
@@ -68,7 +67,9 @@ case "${DO}" in
 				rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
 				[ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
 			fi
-		fi                           
+		fi
+
+		/etc/rc.d/init.d/static-routes start
 		;;
 
 	stop)