From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Jul 2010 11:40:27 +0000 (+0200)
Subject: network: Do initial configuration once at boot time.
X-Git-Url: http://git.ipfire.org/?p=people%2Farne_f%2Fnetwork.git;a=commitdiff_plain;h=b8357295110941bea1946f708d96673c7729db23

network: Do initial configuration once at boot time.
---

diff --git a/functions b/functions
index 89a4ed02..befdd145 100644
--- a/functions
+++ b/functions
@@ -41,6 +41,3 @@ case "${COLOURS}" in
 		;;
 esac
 
-if [ "$(basename ${0})" = "network" ]; then
-	init_run
-fi
diff --git a/functions.ppp b/functions.ppp
index fa3a7bec..c10e7e7c 100644
--- a/functions.ppp
+++ b/functions.ppp
@@ -23,7 +23,7 @@ function ppp_init() {
 	mkdir -p /var/run/ppp 2>/dev/null
 }
 
-register_init ppp_init
+init_register ppp_init
 
 function ppp_common_ip_pre_up() {
 	local zone=${1}
diff --git a/functions.virtual b/functions.virtual
index 9d35e4e8..74347d73 100644
--- a/functions.virtual
+++ b/functions.virtual
@@ -21,6 +21,17 @@
 
 function virtual_init() {
 	module_load 8021q
+
+	ebtables-restore <<EOF
+*filter
+:INPUT ACCEPT
+:FORWARD ACCEPT
+:OUTPUT ACCEPT
+
+*broute
+:BROUTING ACCEPT
+-A BROUTING -p 802_1Q -j DROP
+EOF
 }
 
 init_register virtual_init
diff --git a/network b/network
index d4a75b83..23098482 100755
--- a/network
+++ b/network
@@ -38,6 +38,10 @@ done
 
 # Process the given action
 case "${action}" in
+	init)
+		init_run
+		;;
+
 	config|port|device|zone|start|stop|restart|status|reset)
 		cli_${action} $@
 		;;