fixes files from [3112]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3114 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 4 insertions, 6 deletions

diff --git a/openwrt/package/base-files/default/etc/init.d/S45firewall b/openwrt/package/base-files/default/etc/init.d/S45firewall
index 0110cfc775..2942f3118e 100755
--- a/openwrt/package/base-files/default/etc/init.d/S45firewall
+++ b/openwrt/package/base-files/default/etc/init.d/S45firewall
@@ -81,11 +81,9 @@ iptables -t nat -N postrouting_rule
   iptables -A FORWARD -j forwarding_rule
 
   # allow
-  # if there is bridge splitting this workaround works too
-  for iface in $LAN; do
-  	iptables -A FORWARD -i $iface -o $iface -j ACCEPT
-	[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
-  done
+  iptables -A FORWARD -i br0 -o br0 -j ACCEPT
+  [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
+
   # reject (what to do with anything not allowed earlier)
   # uses the default -P DROP
 
diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 693c694c1b..427ff0444f 100755
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then
 			pivot_root /jffs /jffs/rom
 			mount none /proc -t proc
 			mount none /dev -t devfs
-			umount /rom/proc rom/dev >&-
+			umount /rom/proc /rom/dev >&-
 		fi
 	fi
 fi