From 7cc5a82efe4080b9bd84966c7e632763178ef248 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 7 Aug 2021 15:36:06 +0100 Subject: [PATCH] test: fixes, tun Signed-off-by: Ian Jackson --- test/test.cfg | 4 ++-- uml/psusan-uml-inside | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test.cfg b/test/test.cfg index 9cc92d9..1180fb3 100644 --- a/test/test.cfg +++ b/test/test.cfg @@ -1,6 +1,6 @@ [SERVER] -ipif = PATH=/usr/local/sbin:/sbin:/usr/sbin:$PATH really /home/ian/things/Userv/userv-utils.git/ipif/service \* -- %(local)s,%(peer)s,%(mtu)s,slip '%(rnets)s' +ipif = /usr/lib/userv/ipif \* -- %(local)s,%(peer)s,%(mtu)s,slip '%(rnets)s' addrs = 127.0.0.1 port = 8099 @@ -14,7 +14,7 @@ vnetwork = 192.0.2.0/24 secret = sesame [192.0.2.3] -ipif = PATH=/usr/local/sbin:/sbin:/usr/sbin:$PATH really ./fake-userv /home/ian/things/Userv/userv-utils.git/ipif/service \* -- %(local)s,%(peer)s,%(mtu)s,slip '%(rnets)s' +ipif = /usr/lib/userv/ipif \* -- %(local)s,%(peer)s,%(mtu)s,slip '%(rnets)s' # ./hippotat -D -c test.cfg diff --git a/uml/psusan-uml-inside b/uml/psusan-uml-inside index 79a38c9..bb2c8d6 100755 --- a/uml/psusan-uml-inside +++ b/uml/psusan-uml-inside @@ -3,10 +3,14 @@ set -ex mkdir /dev/pts mount -t proc none /proc +mount -t sysfs none /sys mount -t devpts none /dev/pts mount -t tmpfs none /tmp mount -t tmpfs none /run +mount --bind /usr/lib/uml/modules/ /lib/modules/ +modprobe tun + exec 0<>/dev/tty1 1>&0 stty raw -echo -- 2.30.2