test: Add external mbuto profile, drop udhcpc, and switch to it
This depends on a future change in mbuto to accept external profile files. Add a file defining what we need for tests and demos, dropping udhcpc and script as they're not needed anymore, and switch to it. Suggested-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
2757d3c0b6
commit
20c418f1f9
3 changed files with 39 additions and 2 deletions
|
@ -56,7 +56,7 @@ say Let's create a small initramfs image for the guest.
|
||||||
guest cd __TEMPDIR__
|
guest cd __TEMPDIR__
|
||||||
guest git clone git://mbuto.sh/mbuto
|
guest git clone git://mbuto.sh/mbuto
|
||||||
guest cd mbuto
|
guest cd mbuto
|
||||||
guest ./mbuto -f passt.img -p passt -c lz4
|
guest ./mbuto -f passt.img -p __TEMPDIR__/passt/test/passt.mbuto -c lz4
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
nl
|
nl
|
||||||
|
|
|
@ -34,7 +34,7 @@ setup_passt() {
|
||||||
pane_run GUEST "git -C ${__mbuto_dir} clone git://mbuto.sh/mbuto"
|
pane_run GUEST "git -C ${__mbuto_dir} clone git://mbuto.sh/mbuto"
|
||||||
pane_status GUEST
|
pane_status GUEST
|
||||||
|
|
||||||
pane_run GUEST "${__mbuto_dir}/mbuto/mbuto -p passt -c lz4 -f mbuto.img"
|
pane_run GUEST "${__mbuto_dir}/mbuto/mbuto -p test/passt.mbuto -c lz4 -f mbuto.img"
|
||||||
pane_status GUEST
|
pane_status GUEST
|
||||||
|
|
||||||
rm -rf "${__mbuto_dir}"
|
rm -rf "${__mbuto_dir}"
|
||||||
|
|
37
test/passt.mbuto
Executable file
37
test/passt.mbuto
Executable file
|
@ -0,0 +1,37 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
#
|
||||||
|
# PASST - Plug A Simple Socket Transport
|
||||||
|
# for qemu/UNIX domain socket mode
|
||||||
|
#
|
||||||
|
# test/passt.mbuto - mbuto (https://mbuto.sh) profile for test images
|
||||||
|
#
|
||||||
|
# Copyright (c) 2022 Red Hat GmbH
|
||||||
|
# Author: Stefano Brivio <sbrivio@redhat.com>
|
||||||
|
|
||||||
|
PROGS="${PROGS:-ash,dash,bash ip mount ls insmod mkdir ln cat chmod lsmod
|
||||||
|
modprobe find grep mknod mv rm umount jq iperf3 dhclient busybox logger
|
||||||
|
sed tr chown sipcalc cut md5sum nc dd strace ping tail killall sleep
|
||||||
|
sysctl nproc tcp_rr tcp_crr udp_rr which tee seq bc}"
|
||||||
|
|
||||||
|
KMODS="${KMODS:- virtio_net virtio_pci}"
|
||||||
|
|
||||||
|
LINKS="${LINKS:-
|
||||||
|
ash,dash,bash /init
|
||||||
|
ash,dash,bash /bin/sh
|
||||||
|
ash,dash,bash /usr/bin/bash}"
|
||||||
|
|
||||||
|
COPIES="${COPIES}
|
||||||
|
/sbin/dhclient-script"
|
||||||
|
|
||||||
|
DIRS="${DIRS} /tmp"
|
||||||
|
|
||||||
|
FIXUP="${FIXUP}
|
||||||
|
:> /etc/fstab
|
||||||
|
sh +m
|
||||||
|
"
|
||||||
|
|
||||||
|
OUTPUT="KERNEL=__KERNEL__
|
||||||
|
INITRD=__INITRD__
|
||||||
|
"
|
Loading…
Reference in a new issue