From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Aug 2021 11:13:06 +0000 (+0100)
Subject: uml: plumbing
X-Git-Tag: hippotat/1.0.0~304
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=488191f4770edfd9990ab847b061e4227f79a091;p=hippotat.git

uml: plumbing

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

diff --git a/uml/psusan-uml-inside b/uml/psusan-uml-inside
index ec5a393..24658e3 100755
--- a/uml/psusan-uml-inside
+++ b/uml/psusan-uml-inside
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 mkdir /dev/pts
 mount -t proc none /proc
@@ -15,4 +15,16 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 export PATH
 export SHELL=/bin/bash
 
+HOME=$(cat /proc/cmdline)
+case "$HOME" in
+*' psusan-uml-tmp='*) ;;
+*) echo >&2 'psusan-uml-tmp not found in /proc/cmdline'; exit 1;;
+esac
+HOME=${HOME##* psusan-uml-tmp=}
+HOME=${HOME%% *}
+export HOME
+cd "$HOME"
+
+dd if=random-seed of=/dev/urandom
+
 exec psusan
diff --git a/uml/psusan-uml-psusan b/uml/psusan-uml-psusan
index 2dd8ade..617824d 100755
--- a/uml/psusan-uml-psusan
+++ b/uml/psusan-uml-psusan
@@ -11,7 +11,8 @@ mkfifo -m600 $fifo
 ) 								| 	\
  bwrap --dev-bind / / --tmpfs /dev/shm					\
  linux mem=512M rootfstype=hostfs rootflags=/ rw			\
-       con=fd:2,fd:2 con1=fd:0,fd:1 init="${0%/*}"/psusan-uml-inside | 	\
+       con=fd:2,fd:2 con1=fd:0,fd:1 init="${0%/*}"/psusan-uml-inside  	\
+       -- psusan-uml-tmp=$PWD/tmp/uml				|	\
 (
  read banner
  : >$fifo
diff --git a/uml/psusan-uml-setup b/uml/psusan-uml-setup
index 1a1e9c0..7e9da78 100755
--- a/uml/psusan-uml-setup
+++ b/uml/psusan-uml-setup
@@ -4,5 +4,6 @@ set -e
 mkdir -p tmp
 rm -rf tmp/uml
 mkdir -p -m2700 tmp/uml
+dd if=/dev/urandom of=tmp/uml/random-seed bs=1k count=4
 
 "${0%/*}"/psusan-uml-run -proxycmd "${0%/*}"/psusan-uml-psusan -N -v -v