Undo change to tag, commit to trunk instead

[vsys.git] / factory / setup-link

diff --git a/factory/setup-link b/factory/setup-link
index b8c748c..e5cbd2f 100755 (executable)
--- a/factory/setup-link
+++ b/factory/setup-link
@@ -36,7 +36,7 @@ ifconfig $BRIDGE up
 iptables -t mangle -A FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
 
 ### Create "grab link" script
-GRAB=/vsys/grab-$ETUN0
+GRAB=/vsys/local_grab-$ETUN0
 echo $SLICE > $GRAB.acl 
 rm -f $GRAB
 cat > $GRAB <<EOF
@@ -49,17 +49,16 @@ EOF
 chmod +x $GRAB
 
 ### Create script for setting link rate
-BIND=/vsys/rate-$ETUN0
+BIND=/vsys/local_rate-$ETUN0
 echo $SLICE > $BIND.acl 
 rm -f $BIND
 cat > $BIND <<EOF
 #!/bin/sh
 
 read rt
-read lt
-read burs
 
-tc qdisc add dev $EGRE root tbf rate \$rt latency \$lt burst \$burs
+tc qdisc add dev $EGRE root handle 1: htb default 10
+tc class add dev $EGRE parent 1: classid 1:10 htb rate \$rt ceil \$rt
 
 rm -rf $BIND.acl 
 touch $BIND.acl 
@@ -68,7 +67,7 @@ EOF
 chmod +x $BIND
 
 ### Create "delete link" script
-DELETE=/vsys/delete-$ETUN0
+DELETE=/vsys/local_delete-$ETUN0
 echo $SLICE > $DELETE.acl 
 rm -f $DELETE
 cat > $DELETE <<EOF