diff options
| author | Jacob Moody <moody@posixcafe.org> | 2022-10-18 00:07:30 +0000 |
|---|---|---|
| committer | Jacob Moody <moody@posixcafe.org> | 2022-10-18 00:07:30 +0000 |
| commit | 58339beadd65d86a8454d39aa11e47de1a92f7a5 (patch) | |
| tree | a98778df08a6c19bbd99d8157baf80ab28a31596 | |
| parent | 0fbecab00e9354a08e8099d1ffd1e10830c25885 (diff) | |
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.
| -rwxr-xr-x | rc/bin/window | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rc/bin/window b/rc/bin/window index 719a7c3cc..0f7c00c87 100755 --- a/rc/bin/window +++ b/rc/bin/window @@ -90,12 +90,12 @@ if(~ $#mflag 1) { } 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 { |