Add backslash

[vsys.git] / factory / setup-link

diff --git a/factory/setup-link b/factory/setup-link
index 78bc750..cc800ce 100755 (executable)
--- a/factory/setup-link
+++ b/factory/setup-link
@@ -1,36 +1,24 @@
 #!/bin/sh +x
 
-IP=/sbin/ip
-
 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}
 
 modprobe ip_gre
-modprobe etun
 
 ### Setup EGRE tunnel
 EGRE=d$LINK
-$IP tunnel add $EGRE  mode gre/eth remote $REMOTE key $KEY
-$IP link set $EGRE up
+ip tunnel add $EGRE  mode gre type eth remote $REMOTE key $KEY ttl 64
+ip link set $EGRE up
 
 ### Setup etun
 ETUN0=a$LINK
 ETUN1=b$LINK
-echo $ETUN0,$ETUN1 > /sys/module/etun/parameters/newif
+ip link add name $ETUN0 type veth peer name $ETUN1
 ifconfig $ETUN0 mtu 1458 up
 ifconfig $ETUN1 up
 
@@ -53,7 +41,7 @@ cat > $GRAB <<EOF
 
 read PID
 
-chcontext --ctx 1 -- echo \$PID > /sys/class/net/$ETUN0/new_ns_pid 
+ip link set $ETUN0 netns \$PID
 EOF
 chmod +x $GRAB
 
@@ -88,7 +76,7 @@ read NULL
 iptables -t mangle -D FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
 
 # Get rid of etun devices, only need name of one of them
-echo $ETUN1 > /sys/module/etun/parameters/delif
+ip link delete dev $ETUN1 
 
 # Get rid of bridge
 ifconfig $BRIDGE down