shithub: riscv

Download patch

ref: 58339beadd65d86a8454d39aa11e47de1a92f7a5
parent: 0fbecab00e9354a08e8099d1ffd1e10830c25885
author: Jacob Moody <moody@posixcafe.org>
date: Mon Oct 17 20:07:30 EDT 2022

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 {