Merging recent changes from the 4.2 branch into trunk.

[vsys.git] / factory / setup-link

diff --git a/factory/setup-link b/factory/setup-link
index 58a431f..e5cbd2f 100755 (executable)
--- a/factory/setup-link
+++ b/factory/setup-link
@@ -6,16 +6,7 @@ SLICE=$1
 SLICEID=`id -u $SLICE`
 read INDEX
 read REMOTE
-
-KEYFILE="/etc/vini/egre-keys.txt"
-if [ -e "$KEYFILE" ]; then
-    KEY=$( awk -v slice=$SLICE '$1 == slice {print $2}' $KEYFILE )
-fi
-if [ -z "$KEY" ]; then
-    echo "No EGRE key found for slice $SLICE!"
-    echo "Please send mail to vini-users@lists.planet-lab.org."
-    exit 1
-fi
+read KEY
 
 LINK=${KEY}if${INDEX}
 
@@ -24,7 +15,7 @@ modprobe etun
 
 ### Setup EGRE tunnel
 EGRE=d$LINK
-$IP tunnel add $EGRE  mode gre/eth remote $REMOTE key $KEY ttl 64
+$IP tunnel add $EGRE  mode gre/eth remote $REMOTE key $KEY
 $IP link set $EGRE up
 
 ### Setup etun