summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorglenda <glenda@cirno.localdomain>2015-08-25 09:35:10 +0000
committerglenda <glenda@cirno.localdomain>2015-08-25 09:35:10 +0000
commitc4fdc6bfdb2211e13643d5fba75edf437c122eef (patch)
treed5991bc7350d3058cfcefe06dfa43814e62df919 /lib
parent6b402b83cffc97015345dab1c27c35afe64bb3db (diff)
downloadplan9front-c4fdc6bfdb2211e13643d5fba75edf437c122eef.tar.xz
fix fuckup
Diffstat (limited to 'lib')
-rw-r--r--lib/namespace.httpd41
-rw-r--r--lib/vgadb11
2 files changed, 35 insertions, 17 deletions
diff --git a/lib/namespace.httpd b/lib/namespace.httpd
index dcde8ed7e..74d4faaeb 100644
--- a/lib/namespace.httpd
+++ b/lib/namespace.httpd
@@ -1,10 +1,39 @@
-bind /cfg /usr/web/cfg
-bind /386 /usr/web/386
-bind /amd64 /usr/web/amd64
+# we start with the namespace of the console...
-bind /sys/src/9 /usr/web/sys/src/9
+# man2html expects man pages under /sys/man
+mount #s/boot /n/emelieother other
+bind /n/emelieother/plan9/sys/man /usr/web/sys/man
+#bind /n/emelieother/plan9/sys/doc /usr/web/sys/doc
+#bind /sys/man /usr/web/sys/man
+bind /sys/doc /usr/web/sys/doc
-mount #s/etcd /n/etcd
-bind /n/etcd/www /usr/web/etc
+# just so people will find something under plan9
+bind /usr/web/plan9dist /usr/web/plan9
+
+# users
+bind /usr/mike/www /usr/web/incoming/mike
+
+# netlib
+bind /netlib/pub /usr/web/netlib
+mount -b #s/netlib.depend.pub /usr/web/netlib.depend
+# don't need to bind to /usr/web/math etc. because of /sys/lib/http-rewrite
+
+# who what why when where
+mount /srv/alice /n/alice
+bind -b /n/alice/cm /usr/web/cm
+bind /usr/web/cm/who /usr/web/who
+bind -b /usr/web/cm/physics/who /usr/web/who
+bind -b /usr/web/cm/blrsv/who /usr/web/who
+bind -b /usr/web/cm/ss/who /usr/web/who
+bind -b /usr/web/cm/ms/who /usr/web/who
+bind -b /usr/web/cm/china/who /usr/web/who
+bind -b /usr/web/cm/cs/who /usr/web/who
+bind /usr/web/cm/ms/what/wavelet /usr/web/wavelet
+
+# formerly ftp.research.bell-labs.com
+bind -b /n/alice/usr/ftp /usr/web/dist
+
+# wiki (questions to rsc)
+mount -b #s/wiki.plan9 /usr/web/wiki/plan9
# httpd will bind /usr/web onto /
diff --git a/lib/vgadb b/lib/vgadb
index 5b9e8323a..5d03140c9 100644
--- a/lib/vgadb
+++ b/lib/vgadb
@@ -435,7 +435,6 @@ ctlr
ctlr=geode linear=1
ctlr
- vid=0x8086 did=0x0126 # Intel 2nd Gen Core
vid=0x8086 did=0x0166 # Intel 3rd Gen Core
vid=0x8086 did=0x2a42 # Intel 4 Series Mobile
link=vga
@@ -1696,16 +1695,6 @@ s2231wD=1680x1050
hsync=+ vsync=-
#
-# Lenovo T420 (LCD) LVDS
-#
-#t420=1366x768 # 60Hz
-# clock=69.3
-# shb=1398 ehb=1430 ht=1470
-# vrs=771 vre=776 vt=786
-# hsync=- vsync=-
-# lcd=1
-
-#
# Lenovo X230 (LCD) LVDS
#
x230=1366x768 # 60Hz