code: plan9front

Info  •  Files  •  Log

window: fix regression w.r.t subrios

When running a plumber and rio combo within a window we were wrongly
using the 'root' rios /dev/wctl.  This change happened when we removed
$wctl and had subtly changed the priority of ways /bin/window used to
talk to rio.  This mimics the old behavior.

--- a/rc/bin/window

+++ b/rc/bin/window

@@ -90,12 +90,12 @@

 }

 if not {

 	if(~ $wctl ''){

-		if(test -f /dev/wctl) wctl=/dev/wctl

-		if not if(! ~ $wsys '') {

+		if(! ~ $wsys '') {

 			rfork n

 			mount -b $wsys /mnt/wsys none

 			wctl=/mnt/wsys/wctl

 		}

+		if not if(test -f /dev/wctl) wctl=/dev/wctl

 		if not if(test -f /mnt/term/dev/wctl) wctl=/mnt/term/dev/wctl

 		if not if(test -r /mnt/term/env/wctl) wctl=/mnt/term^`{cat /mnt/term/env/wctl}

 		if not {