Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 61 insertions, 15 deletions

diff --git a/package/base-files/extra/etc/network/if-post-down.d/01-bridge b/package/base-files/extra/etc/network/if-post-down.d/01-bridge
index eda1fe3bf..47f3c976b 100755
--- a/package/base-files/extra/etc/network/if-post-down.d/01-bridge
+++ b/package/base-files/extra/etc/network/if-post-down.d/01-bridge
@@ -22,3 +22,5 @@ for IF in $INTERFACES; do
 done
 
 ip link set down dev $IFACE || exit 1
+brctl delbr $IFACE
+exit 0
diff --git a/package/base-files/extra/etc/network/if-post-down.d/02-vlan b/package/base-files/extra/etc/network/if-post-down.d/02-vlan
new file mode 100755
index 000000000..e448a7641
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-post-down.d/02-vlan
@@ -0,0 +1,10 @@
+#!/bin/sh
+  
+[ -x /sbin/vconfig ] || exit 0
+
+[ -e /proc/net/vlan/$IFACE ] && (
+	ip link set down dev $IFACE 
+	vconfig rem $IFACE
+)
+
+exit 0
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/01-atm b/package/base-files/extra/etc/network/if-pre-up.d/01-atm
index 08baf73c7..5c168c001 100644..100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/01-atm
+++ b/package/base-files/extra/etc/network/if-pre-up.d/01-atm
@@ -1,18 +1,15 @@
 #!/bin/sh
 
-if [ ! -x /usr/sbin/br2684ctl ]
-then
-  exit 0
-fi
+[ -x /usr/sbin/br2684ctl ] || exit 0
 
-[ "$METHOD" == "atm" ] || exit 0
+[ "${IFACE%%[0-9]*}" = "nas" ] || exit 0
 
 [ "$IF_ATM_ENCAPS" ] || encap=0
 [ "$IF_ATM_PAYLOAD" ] || payload=1
-[ "$IF_ATM_VPI" ] || $IF_ATM_VPI=1
-[ "$IF_ATM_VCI" ] || $IF_ATM_VCI=32
+[ "$IF_ATM_VPI" ] || IF_ATM_VPI=1
+[ "$IF_ATM_VCI" ] || IF_ATM_VCI=32
 
-case "$IF_ATM_PAYLOAD" in
+[ "$IF_ATM_PAYLOAD" ] && case "$IF_ATM_PAYLOAD" in
 bridged)
         payload=1
         ;;
@@ -25,7 +22,7 @@ routed)
         ;;
 esac
 
-case "$IF_ATM_ENCAPS" in
+[ "$IF_ATM_ENCAPS" ] && case "$IF_ATM_ENCAPS" in
 llc)
         encap=0
         ;;
@@ -38,6 +35,7 @@ vc)
         ;;
 esac
 
-br2684ctl -b -c 0 -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI
-ifconfig nas0 up
+br2684ctl -b -c ${IFACE##*[a-z]} -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI
+ifconfig nas${IFACE##*[a-z]} up
+
 exit 0
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-vlan b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan
new file mode 100755
index 000000000..09b9cf0da
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+[ -x /sbin/vconfig ] || exit 0
+
+case "$IFACE" in
+        vlan*)
+               	vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+               	VLANID=`echo $IFACE|sed "s/vlan*//"`
+		;;
+	eth*.*)
+		vconfig set_name_type DEV_PLUS_VID_NO_PAD
+		VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.*//g"`
+		IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/"`
+		;;
+	*)
+		exit 0
+		;;
+esac
+
+if [ "$IF_VLAN_RAW_DEVICE" != "" ]; then
+	if ! grep -q "$IF_VLAN_RAW_DEVICE" /proc/net/dev
+	then
+		echo "$IF_VLAN_RAW_DEVICE does not exist, unable to create $IFACE"
+		exit 1
+	fi
+	ip link set up dev $IF_VLAN_RAW_DEVICE
+	vconfig add $IF_VLAN_RAW_DEVICE $VLANID
+	if [ "$IF_MAC_ADDRESS" != "" ]
+	then
+		ip link set $IF_VLAN_RAW_DEVICE.$VLANID address $IF_MAC_ADDRESS
+	fi
+	ip link set up dev $IF_VLAN_RAW_DEVICE.$VLANID
+fi
+
+exit 0
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge
index 766084de1..41ddb2b58 100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge
+++ b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-if [ ! -x /usr/sbin/brctl ]
-then
-  exit 0
-fi
+[ -x /usr/sbin/brctl ] || exit 0
 
 case "$IF_BRIDGE_PORTS" in
     "")
diff --git a/package/base-files/extra/etc/network/if-up.d/01-bridge b/package/base-files/extra/etc/network/if-up.d/01-bridge
new file mode 100755
index 000000000..e5962f12f
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-up.d/01-bridge
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ "${IFACE%%[0-9]*}" = "br" ] && ip link set up dev $IFACE
+exit 0