X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=sys%2Flib%2Fnewuser;h=fd6e6d887b2d83ab713bb560690319b6b8c7aeeb;hb=7986722cec798e96443096112580b4ab446fefa8;hp=a4fd42689c0f0ea71307f76437218358e9f59c30;hpb=093ca3a18224e6d17413cd5e85301741ab92313e;p=plan9front.git

diff --git a/sys/lib/newuser b/sys/lib/newuser
index a4fd42689..fd6e6d887 100755
--- a/sys/lib/newuser
+++ b/sys/lib/newuser
@@ -8,10 +8,8 @@ if(test -f $home/lib/profile){
 }
 cd $home
 x='$'
-mkdir bin bin/rc bin/mips bin/386 bin/power bin/arm
+mkdir bin bin/rc bin/mips bin/386 bin/amd64 bin/power bin/arm
 mkdir lib tmp
-touch lib/webcookies
-chmod 600 lib/webcookies
 chmod +t tmp
 bind -qc /n/other/usr/$user/tmp $home/tmp
 bind -c $home/tmp /tmp
@@ -19,46 +17,46 @@ mail -c
 auth/cron -c
 
 cat > lib/profile <<!
-bind -a $x^home/bin/rc /bin
-bind -a $x^home/bin/$x^cputype /bin
-mount -qC /srv/cwfs /n/other other
-bind -qc /n/other/usr/$x^user/tmp $x^home/tmp
-bind -c $x^home/tmp /tmp
-font=/lib/font/bit/vga/vga.font
+bind -qa $x^home/bin/rc /bin
+bind -qa $x^home/bin/$x^cputype /bin
+font=/lib/font/bit/vga/unicode.font
 switch($x^service){
 case terminal
 	webcookies
 	webfs
 	plumber
-	startupasfs
 	echo -n accelerated > '#m/mousectl'
 	echo -n 'res 3' > '#m/mousectl'
 	prompt=('term% ' '	')
 	fn term%{ $x^* }
-	exec rio
+	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 $x^sysname > /dev/label
-	}
 	bind /mnt/term/dev/cons /dev/cons
-	bind /mnt/term/dev/consctl /dev/consctl
+	bind -q /mnt/term/dev/consctl /dev/consctl
+	>[2] /dev/null {
+		cp /dev/sysname /mnt/term/dev/label
+		if(wsys=`{cat /mnt/term/env/wsys})
+			wsys=/mnt/term^$x^wsys
+	} 
 	bind -a /mnt/term/dev /dev
 	prompt=('cpu% ' '	')
 	fn cpu%{ $x^* }
-	startupasfs
-	if (! test -e /mnt/term/mnt/wsys) {
-		# cpu call from drawterm
-		font=/lib/font/bit/pelm/latin1.8.font
+	if(! test -e /mnt/term/dev/wsys){
+		# call from drawterm
+		if(test -e /mnt/term/dev/secstore){
+			auth/factotum -n
+			read -m /mnt/term/dev/secstore >/mnt/factotum/ctl
+			echo >/mnt/term/dev/secstore
+		}
+		if not
+			auth/factotum
+		webcookies
+		webfs
 		plumber
-		auth/factotum
-		exec rio
+		rio
 	}
 case con
 	prompt=('cpu% ' '	')
-	startupasfs
 }
 !
 cat > lib/plumbing <<!