Index: nodes/CNodeGrip/wleiden.conf
===================================================================
--- nodes/CNodeGrip/wleiden.conf	(revision 8261)
+++ nodes/CNodeGrip/wleiden.conf	(revision 8545)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeGrip
@@ -8,88 +5,68 @@
 $nodetype='CNode';
 $nodename='Grip';
-
-$status='up';
-
-$release="5.0-RELEASE";
-
-
+$status='down';
+$release="8.0-RELEASE";
 # edugis x,y 93497,462505
 $X='93497';
 $Y='462505';
 
-$LOKATIE='Fruitweg';
-
-
-$config{'wi0'}=sprintf <<EW0;
+$config{'ath0'}=sprintf <<ATH0;
 COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
+DESC=omni (dubbele waveguide)
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Grip
+CHANNEL=11
+ATH0
 
-DESC=omni (dubbele waveguide)
-SDESC=no
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar vosko1
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.60/29
+DESC=Link naar vosko1
+SDESC=2vosko1
+MODE=managed
+ESSID=il-zw.vosko1.wleiden.net
+DHCP=no
+NSIP=172.16.16.59/29
+NSMAC=
+VR0
 
-DHCP=10-60
-
-
-MODE=master
-ESSID=ap-omni.grip.wleiden.net
-CHANNEL=11
-
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;
-COMMENT=link naar IMI
-TYPE=wireless
-IP=172.16.0.250/30
-DESC=Link naar IMI
-SDESC=2imi
-
-
-MODE=managed
-ESSID=il-zo.imi.wleiden.net
-
-
-DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;
+$config{'vr1'}=sprintf <<VR1;
 COMMENT=Link naar ROCl
-TYPE=wireless
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.0.254/30
 DESC=Link naar ROCl
 SDESC=2rocl
-
-
 MODE=managed
 ESSID=il-nw.rocl.wleiden.net
+CHANNEL=11
+DHCP=no
+BulletIP=192.168.1.20/24
+BulletMAC=
+VR1
 
-CHANNEL=11
-
-
-DHCP=no
-
-EW2
-
-
-
-$config{'wi3'}=sprintf <<EW3;
+$config{'vr2'}=sprintf <<VR2;
 COMMENT=link naar LCPL
-TYPE=wireless
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.1/30
 DESC=Link naar LCPL
 SDESC=2lcpl
+MODE=master
+ESSID=il-zw.grip.wleiden.net
+CHANNEL=8
+DHCP=no
+BulletIP=192.168.1.20/24
+BulletMAC=
+VR2
 
 
-MODE=master
-ESSID=il-zw.grip.wleiden.net
-
-CHANNEL=8
-
-
-DHCP=no
-
-EW3
-
-