vx32

commit 826dd5bc43abce6586e6b8affcafe7fb20a7e370
parent e79eedb68ef6444208e4a26851e4c8a412e66bd4
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Thu, 30 Sep 2010 01:03:33 +0200

set root from env in scripts: PLAN9VXROOT

Diffstat:
M
bin/9vxp
 | 
2
+-
M
bin/9vxtap
 | 
5
++++-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/9vxp b/bin/9vxp
@@ -3,7 +3,7 @@
 #   Reads configuration from ~/.9vxp.ini
 
 # Default root (can be changed with -r)
-root=/usr/local/plan9/9vx.kfs
+root=${PLAN9VXROOT:=/usr/local/plan9vx}
 
 fatal() { echo $* 1>&2; exit 1; }
 abs() { f=$1
diff --git a/bin/9vxtap b/bin/9vxtap
@@ -2,6 +2,9 @@
 
 USERID=`whoami`
 
+# Default root (can be changed with -r)
+root=${PLAN9VXROOT:=/usr/local/plan9vx}
+
 # Create the tap device with tunctl
 IFACE=`sudo tunctl -b -u $USERID`
 # or openvpn
@@ -15,7 +18,7 @@ sudo /sbin/ifconfig $IFACE 0.0.0.0 up
 sudo /usr/sbin/brctl addif br0 $IFACE
 
 # Launch 9vx (use -F to not fork)
-9vx -F "ether0=type=tap dev=$IFACE" $*
+9vx -F "ether0=type=tap dev=$IFACE" -r $root $*
 
 # Bring the tap device down and disconnect from br0
 sudo /sbin/ifconfig $IFACE down