move /usr to /sys/lib/dist/usr for initial user directories

8 files changed, 95 insertions, 6 deletions

diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile
index e4e25cc5a..bc73c7766 100644
--- a/sys/lib/dist/mkfile
+++ b/sys/lib/dist/mkfile
@@ -2,8 +2,10 @@ cd:V: /tmp/9front.iso
 	
 
 %.iso: pc/plan9.ini.cd
+	bind usr /n/src9/usr
 	bind /n/src9 /n/src9/dist/plan9front
 	bind pc/plan9.ini.cd /n/src9/cfg/plan9.ini
 	disk/mk9660 -c9j -B 386/9bootiso -p /n/src9/sys/lib/sysconfig/proto/cdproto -s /n/src9 -v 'Plan 9 Front' $target
 	unmount /n/src9/cfg/plan9.ini
 	unmount /n/src9/dist/plan9front
+	unmount /n/src9/usr
diff --git a/sys/lib/dist/usr/bootes/lib/newstime b/sys/lib/dist/usr/bootes/lib/newstime
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/sys/lib/dist/usr/bootes/lib/newstime
diff --git a/sys/lib/dist/usr/bootes/lib/plumbing b/sys/lib/dist/usr/bootes/lib/plumbing
new file mode 100644
index 000000000..ec82918a2
--- /dev/null
+++ b/sys/lib/dist/usr/bootes/lib/plumbing
@@ -0,0 +1,6 @@
+# to update: cp /usr/bootes/lib/plumbing /mnt/plumb/rules
+
+editor = acme
+
+include basic
+
diff --git a/sys/lib/dist/usr/bootes/lib/profile b/sys/lib/dist/usr/bootes/lib/profile
new file mode 100644
index 000000000..967865113
--- /dev/null
+++ b/sys/lib/dist/usr/bootes/lib/profile
@@ -0,0 +1,39 @@
+bind -a $home/bin/rc /bin
+bind -a $home/bin/$cputype /bin
+bind -c $home/tmp /tmp
+font = /lib/font/bit/pelm/euro.9.font
+switch($service){
+case terminal
+	plumber
+	startupasfs
+	echo -n accelerated > '#m/mousectl'
+	echo -n 'res 3' > '#m/mousectl'
+	prompt=('term% ' '	')
+	fn term%{ $* }
+	exec rio
+case cpu
+	if (test -e /mnt/term/mnt/wsys) {
+		# rio already running
+		wsys = /mnt/term^`{cat /mnt/term/env/wsys}
+		bind -a /mnt/term/mnt/wsys /dev
+		echo -n $sysname > /dev/label
+	}
+	bind /mnt/term/dev/cons /dev/cons
+	bind /mnt/term/dev/consctl /dev/consctl
+	bind -a /mnt/term/dev /dev
+	prompt=('cpu% ' '	')
+	fn cpu%{ $* }
+	startupasfs
+	news
+	if (! test -e /mnt/term/mnt/wsys) {
+		# cpu call from drawterm
+		font=/lib/font/bit/pelm/latin1.8.font
+		plumber
+		auth/factotum
+		exec rio
+	}
+case con
+	prompt=('cpu% ' '	')
+	startupasfs
+	news
+}
diff --git a/sys/lib/dist/usr/glenda/bin/rc/riostart b/sys/lib/dist/usr/glenda/bin/rc/riostart
new file mode 100755
index 000000000..f4d3f6104
--- /dev/null
+++ b/sys/lib/dist/usr/glenda/bin/rc/riostart
@@ -0,0 +1,3 @@
+#!/bin/rc
+window 0,0,161,117 stats -lmisce
+window
diff --git a/sys/lib/dist/usr/glenda/lib/plumbing b/sys/lib/dist/usr/glenda/lib/plumbing
new file mode 100644
index 000000000..b209d2d66
--- /dev/null
+++ b/sys/lib/dist/usr/glenda/lib/plumbing
@@ -0,0 +1,6 @@
+# to update: cp /usr/glenda/lib/plumbing /mnt/plumb/rules
+
+editor = acme
+
+include basic
+
diff --git a/sys/lib/dist/usr/glenda/lib/profile b/sys/lib/dist/usr/glenda/lib/profile
new file mode 100644
index 000000000..86c54a22c
--- /dev/null
+++ b/sys/lib/dist/usr/glenda/lib/profile
@@ -0,0 +1,38 @@
+bind -a $home/bin/rc /bin
+bind -a $home/bin/$cputype /bin
+mount -qC /srv/cwfs /n/other other
+bind -qc /n/other/dist /dist
+bind -qc /n/other/usr/$user/tmp $home/tmp
+bind -c $home/tmp /tmp
+if(! syscall create /tmp/xxx 1 0666 >[2]/dev/null)
+	ramfs	# in case we're running off a cd
+font = /lib/font/bit/pelm/euro.9.font
+fn cd { builtin cd $* && awd }  # for acme
+switch($service){
+case terminal
+	plumber
+	touch /tmp/webcookies
+	webfs -c /tmp/webcookies
+	echo -n accelerated > '#m/mousectl'
+	echo -n 'res 3' > '#m/mousectl'
+	prompt=('term% ' '	')
+	fn term%{ $* }
+	exec rio -s -i riostart
+case cpu
+	if (test -e /mnt/term/mnt/wsys) { # rio already running
+		bind -a /mnt/term/mnt/wsys /dev
+		if(test -w /dev/label)
+			echo -n $sysname > /dev/label
+	}
+	bind /mnt/term/dev/cons /dev/cons
+	bind /mnt/term/dev/consctl /dev/consctl
+	bind -a /mnt/term/dev /dev
+	prompt=('cpu% ' '	')
+	fn cpu%{ $* }
+	if (! test -e /mnt/term/mnt/wsys) {	# cpu call from drawterm
+		font=/lib/font/bit/pelm/latin1.8.font
+		exec rio -s
+	}
+case con
+	prompt=('cpu% ' '	')
+}
diff --git a/sys/lib/rootstub b/sys/lib/rootstub
index f0a61eef3..b0fa56782 100755
--- a/sys/lib/rootstub
+++ b/sys/lib/rootstub
@@ -240,9 +240,4 @@ mkdir -p sys/lib/lp/log
 mkdir -p sys/lib/lp/tmp
 mkdir -p sys/log
 mkdir -p tmp
-mkdir -p usr/bootes/bin/386
-mkdir -p usr/bootes/bin/rc
-mkdir -p usr/bootes/tmp
-mkdir -p usr/glenda/bin/386
-mkdir -p usr/glenda/bin/rc
-mkdir -p usr/glenda/tmp
+mkdir -p usr