Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
config/cfgroot/ethernet-vlans

index ae87bfe..88a38e3 100644 (file)
@@ -1,9 +1,9 @@
-#GREEN_PARENT_DEV=eth0
-#GREEN_VLAN_ID=20
-#GREEN_MAC_ADDRESS=00:11:22:33:44:55
-#BLUE_PARENT_DEV=green0
-#BLUE_VLAN_ID=30
-#BLUE_MAC_ADDRESS=00:22:33:44:55:66
-#ORANGE_PARENT_DEV=green0
-#ORANGE_VLAN_ID=40
-#ORANGE_MAC_ADDRESS=00:33:44:55:66:77
+GREEN_PARENT_DEV=
+GREEN_VLAN_ID=
+GREEN_MAC_ADDRESS=
+BLUE_PARENT_DEV=
+BLUE_VLAN_ID=
+BLUE_MAC_ADDRESS=
+ORANGE_PARENT_DEV=
+ORANGE_VLAN_ID=
+ORANGE_MAC_ADDRESS=