Change naming scheme

diff --git a/factory/setup-link b/factory/setup-link
index 52ec656..df3638f 100755 (executable)
--- a/factory/setup-link
+++ b/factory/setup-link
@@ -4,11 +4,12 @@ IP=/sbin/ip
 
 SLICE=$1
 SLICEID=`id -u $SLICE`
-read LINKNUM
-LINK=${SLICEID}$LINKNUM
+read LABEL
 read REMOTE
 read KEY
 
+LINK=${LABEL}k$KEY
+
 modprobe ip_gre
 modprobe etun
 
@@ -18,7 +19,7 @@ $IP tunnel add $EGRE  mode gre/eth remote $REMOTE key $KEY
 $IP link set $EGRE up
 
 ### Setup etun
-ETUN0=veth$LINK
+ETUN0=v$LINK
 ETUN1=etun$LINK
 echo $ETUN0,$ETUN1 > /sys/module/etun/parameters/newif
 ifconfig $ETUN0 up