From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 9 Jul 2008 20:01:54 +0000 (+0000)
Subject: Prefix generated script names with local_ so that NodeManager doesn't stomp on their... 
X-Git-Tag: vsys-0.7-17~3
X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=commitdiff_plain;h=236618a38a437f3bd12924bd926f086e0f0c47b6

Prefix generated script names with local_ so that NodeManager doesn't stomp on their .acl files
---

diff --git a/factory/setup-link b/factory/setup-link
index 6fb4b9e..e5cbd2f 100755
--- 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,7 +49,7 @@ 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
@@ -67,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
diff --git a/factory/setup-nat b/factory/setup-nat
index c6d37e9..64be40b 100755
--- a/factory/setup-nat
+++ b/factory/setup-nat
@@ -19,7 +19,7 @@ ifconfig $ETUN1 10.0.$KEY.1 up
 /sbin/iptables -A FORWARD -i $ETUN1 -o eth0 -j ACCEPT
 
 ### Create "grab link" script
-GRAB=/vsys/grab-$ETUN0
+GRAB=/vsys/local_grab-$ETUN0
 echo $SLICE > $GRAB.acl 
 rm -f $GRAB
 cat > $GRAB <<EOF
@@ -32,7 +32,7 @@ EOF
 chmod +x $GRAB
 
 ### Create "delete link" script
-DELETE=/vsys/delete-$ETUN0
+DELETE=/vsys/local_delete-$ETUN0
 echo $SLICE > $DELETE.acl 
 rm -f $DELETE
 cat > $DELETE <<EOF