Browse Source

Switch to the ninep server from github.com/rminnich/ninep

This has the fix for the 'cd ..' problem we've been seeing.

Change-Id: Ifeb02c29df2747cb46ee1bae641512780b406428
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 4 years ago
parent
commit
4aaaec40f6
6 changed files with 17 additions and 17 deletions
  1. 3 3
      .gitmodules
  2. 2 2
      README
  3. 1 1
      bootstrap.sh
  4. 3 3
      rc/bin/termrc
  5. 1 1
      util/build.json
  6. 7 7
      web/docs/docs/getting-started.md

+ 3 - 3
.gitmodules

@@ -1,3 +1,3 @@
-[submodule "util/third_party/src/github.com/rminnich/go9p"]
-	path = util/third_party/src/github.com/rminnich/go9p
-	url = git@github.com:rminnich/go9p.git
+[submodule "util/third_party/src/github.com/rminnich/ninep"]
+	path = util/third_party/src/github.com/rminnich/ninep
+	url = https://github.com/rminnich/ninep.git

+ 2 - 2
README

@@ -86,10 +86,10 @@ amend the change list as follows
 More information on using Gerrit can be found on the gerrithub.io website.
 
 
-Getting go9p to serve your files
+Getting ninep to serve your files
 ================================
 
-The currently recommended way of doing this is to run go9p/ufs as the
+The currently recommended way of doing this is to run ninep/ufs as the
 file server for harvey. It is provided as a submodule in util/third_party
 and should be automatically compiled & copied to util/ when you run
 'BUILD utils'.

+ 1 - 1
bootstrap.sh

@@ -11,7 +11,7 @@ git submodule init
 git submodule update
 echo Building the build tool...
 GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go get -d harvey/cmd/... # should really vendor these bits
-GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go install github.com/rminnich/go9p/ufs harvey/cmd/...
+GOBIN="$(pwd)/util" GOPATH="$(pwd)/util/third_party:$(pwd)/util" go install github.com/rminnich/ninep/ufs harvey/cmd/...
 cat <<EOF
 
 Now just set your environment variables and build:

+ 3 - 3
rc/bin/termrc

@@ -4,7 +4,7 @@ TIMESYNCARGS=(-rLa1000000)
 NDBFILE=/lib/ndb/local
 
 # Hack
-terminal = "go9p"
+terminal = "ninep"
 
 mntgen -s slashn && chmod 666 /srv/slashn
 
@@ -16,7 +16,7 @@ for(i in f t m v L P u U '$' Σ κ)
 # some variable to distinguish if file server is remote
 # or local disk.
 
-if (! ~ $terminal *go9p*) {
+if (! ~ $terminal *ninep*) {
 	# set up any partitions
 	 diskparts
 
@@ -62,7 +62,7 @@ if(test -e /cfg/$sysname/termrc)
 if(test -e /net/ipifc/0/ctl && ! test -e /srv/dns)
 	ndb/dns -r
 
-if(! ~ $terminal *vx32* && ! ~ $terminal *go9p*){
+if(! ~ $terminal *vx32* && ! ~ $terminal *ninep*){
 	# start timesync if it isn't running and we weren't told not to
 	if(! ps|grep -s timesync)
 		if(! ~ $TIMESYNCARGS '')

+ 1 - 1
util/build.json

@@ -6,7 +6,7 @@
 		],
 		"Post": [
 			"go get -d harvey/...",
-			"go install github.com/rminnich/go9p/ufs harvey/cmd/..."
+			"go install github.com/rminnich/ninep/ufs harvey/cmd/..."
 		]
 	}
 }

+ 7 - 7
web/docs/docs/getting-started.md

@@ -78,20 +78,20 @@ amend the change list as follows
 More information on using Gerrit can be found on the gerrithub.io website.
 
 
-Getting go9p to serve your files
+Getting ninep to serve your files
 ================================
 
-The currently recommended way of doing this is to run go9p/ufs as the file
-server for harvey. You can get go9p/ufs in the following way
+The currently recommended way of doing this is to run ninep/ufs as the file
+server for harvey. You can get ninep/ufs in the following way
 
 	cd util
 	mkdir go
 	cd go
 	export GOPATH=$(pwd)
-	go get github.com/rminnich/go9p
-	go get github.com/rminnich/go9p/ufs
-	go get github.com/rminnich/go9p
-	go install github.com/rminnich/go9p/ufs
+	go get github.com/rminnich/ninep
+	go get github.com/rminnich/ninep/ufs
+	go get github.com/rminnich/ninep
+	go install github.com/rminnich/ninep/ufs
 	cp bin/ufs ..
 
 After these, you have util/ufs, and you can use