test: fixes, tun

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

diff --git a/test/test.cfg b/test/test.cfg
index 9cc92d9d133c2e28a9e49ed65c9fefd5bb932a7f..1180fb3f0156bee1e30f167100b2630f33a4fdb7 100644 (file)
--- 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 79a38c90f0774929c9227450af9fed03a01f01ae..bb2c8d6c55ab4f40e03ffb13cf56356f594c6abe 100755 (executable)
--- 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