From a73b5037e7e3d2dc9520d3ce40e4ef3e2756ab6b Mon Sep 17 00:00:00 2001
From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 21 Mar 2008 21:05:08 +0000
Subject: [PATCH] Change naming scheme

---
 factory/setup-link | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/factory/setup-link b/factory/setup-link
index 52ec656..df3638f 100755
--- 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
-- 
2.43.0