Index: /nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- /nodes/CNodeUniGorN/wleiden.conf	(revision 8095)
+++ /nodes/CNodeUniGorN/wleiden.conf	(revision 8097)
@@ -1,3 +1,2 @@
-#
 #
 #  Read by /usr/local/sbin/wireless-up.pl
@@ -6,17 +5,10 @@
 #
 $location="Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden";
-
 $master_ip='172.19.135.1';  
 $AGGREGATE='24';
 $nodetype='CNode';
 $nodename='UniGorN';
-$DISK='FLASH';
-
 $release="8.0-RELEASE";
-
-
 $status='up';
-
-# edugis x,y 91544,464861
 $X='91544';
 $Y='464861';
@@ -36,5 +28,5 @@
 TYPE=wireless
 IP=172.16.1.89/30
-DESC=Link naar Rustenborgh
+DESC=Link naar Rustenborch
 SDESC=2rustenborch
 DHCP=no
@@ -48,12 +40,4 @@
 DHCP=no
 ATH01
-
-$config{'ath0:2'}=sprintf <<ATH02;
-TYPE=wireless
-IP=172.16.3.249/30
-DESC=Link naar LIACS
-SDESC=2liacs
-DHCP=no
-ATH02
 
 $config{'ue0'}=sprintf <<UE0; #link naar kaagdorp via Bullet 1
@@ -82,20 +66,22 @@
 SDESC=2unused
 DHCP=no
-#ESSID=ilA-o.unigorn.wleiden.net
+#MODE=ap bridge
+#ESSID=il-o.unigorn.wleiden.net
 #CHANNEL=104
-#NSMAC=00:15:6D:EB:F0:64
-#mode 11a bridge master
+#NSMAC=00:15:6D:EA:F0:64
+#NSIP=192.168.1.20
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # A link naar ? via nanostation 2
+$config{'vr1'}=sprintf <<VR1;  # A link naar LIACS
 TYPE=ethernet
 IP=172.16.4.45/30
-DESC=Link naar unused
-SDESC=unused
+DESC=Link naar LIACS
+SDESC=2liacs
 DHCP=no
-#MODE=master
-#ESSID=ilA-n.unigor.wleiden.net
+#MODE=ap bridge
+#ESSID=il-n.unigorn.wleiden.net
 #CHANNEL=128
-#NSMAC=00:15:6D:F3:37:FA
+#NSMAC=00:15:6D:F2:37:FA
+#NSIP=192.168.1.20
 VR1