From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Aug 2021 17:54:07 +0000 (+0100)
Subject: uml: Use console not serial for comms
X-Git-Tag: hippotat/1.0.0~315
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=64a074708ab7535d75ef29a327e99d0472ad3e18;p=hippotat.git

uml: Use console not serial for comms

This seems less odd somehow.  Doesn't seem to make any practical
difference.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/psusan-uml b/psusan-uml
index acc4def..3a22f77 100755
--- a/psusan-uml
+++ b/psusan-uml
@@ -2,4 +2,4 @@
 
 bwrap --dev-bind / / --tmpfs /dev/shm \
 linux mem=512M rootfstype=hostfs rootflags=/ rw \
- con=fd:2,fd:2 ssl0=fd:0,fd:1 init=$PWD/psusan-uml-inside
+ con=fd:2,fd:2 con1=fd:0,fd:1 init=$PWD/psusan-uml-inside
diff --git a/psusan-uml-inside b/psusan-uml-inside
index ee6ec47..a31c95b 100755
--- a/psusan-uml-inside
+++ b/psusan-uml-inside
@@ -3,7 +3,7 @@
 mount -t proc none /proc
 mount -t devpts none /dev/pts
 # Redirect I/O to the serial port, but stderr to the console
-exec 0<>/dev/ttyS0 1>&0 2>/dev/console
+exec 0<>/dev/tty1 1>&0 2>/dev/console
 # Set the serial port into raw mode, to run a binary protocol
 stty raw -echo
 # Choose what shell you want to run inside psusan