aboutgitcodebugslistschat
path: root/test/passt.mbuto
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2022-07-07 16:39:09 +0200
committerStefano Brivio <sbrivio@redhat.com>2022-07-14 01:31:28 +0200
commit4d777144fd214bf67153f1dfa8e1e7b52b44ae35 (patch)
tree498591cd5c7d874d5593f758370df25943ef33a9 /test/passt.mbuto
parent27aec5911a8fd00068c6db8f1a73d61903488b0c (diff)
downloadpasst-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar.gz
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar.bz2
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar.lz
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar.xz
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.tar.zst
passt-4d777144fd214bf67153f1dfa8e1e7b52b44ae35.zip
test: Embed script for dhclient(8) in mbuto(1) profile
David reports that dhclient-script(8) on Fedora needs a number of binaries that are not included in PROGS of the current mbuto profile, and we would also need to include hostnamectl(1) there, which will fail without a systemd init. Embed a minimal script for dhclient(8) in the profile itself, written to /sbin/dhclient-script at boot, to just check what we need to check out of DHCP and DHCPv6 functionality. While at it, drop busybox and logger from PROGS, as we don't need them, and add hostname(1). While DHCP option 12 isn't supported yet by the DHCP implementation in passt, we should probably add it soon. Note: owing to the simplicity of this script, we now need to bring up the interface before starting dhclient: add this in test scripts where it's not the case yet. Reported-by: David Gibson <david@gibson.dropbear.id.au> Suggested-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com> note that we need to bring up the interface before starting dhclient
Diffstat (limited to 'test/passt.mbuto')
-rwxr-xr-xtest/passt.mbuto26
1 files changed, 20 insertions, 6 deletions
diff --git a/test/passt.mbuto b/test/passt.mbuto
index 150c062..968c1cd 100755
--- a/test/passt.mbuto
+++ b/test/passt.mbuto
@@ -11,7 +11,7 @@
# 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
+ modprobe find grep mknod mv rm umount jq iperf3 dhclient hostname
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}"
@@ -22,15 +22,29 @@ LINKS="${LINKS:-
ash,dash,bash /bin/sh
ash,dash,bash /usr/bin/bash}"
-COPIES="${COPIES}
- /sbin/dhclient-script"
+DIRS="${DIRS} /tmp /sbin"
-DIRS="${DIRS} /tmp"
+FIXUP="${FIXUP}"'
+ cat > /sbin/dhclient-script << EOF
+#!/bin/sh
+[ -n "\${new_interface_mtu}" ] && ip link set dev \${interface} mtu \${new_interface_mtu}
+
+[ -n "\${new_ip_address}" ] && ip addr add \${new_ip_address}/\${new_subnet_mask} dev \${interface}
+[ -n "\${new_routers}" ] && for r in \${new_routers}; do ip route add default via \${r} dev \${interface}; done
+[ -n "\${new_domain_name_servers}" ] && for d in \${new_domain_name_servers}; do echo "nameserver \${d}" >> /etc/resolv.conf; done
+[ -n "\${new_domain_name}" ] && (printf "search"; for d in \${new_domain_name}; do printf " %s" "\${d}"; done; printf "\n") >> /etc/resolv.conf
-FIXUP="${FIXUP}
+[ -n "\${new_ip6_address}" ] && ip addr add \${new_ip6_address}/\${new_ip6_prefixlen} dev \${interface}
+[ -n "\${new_dhcp6_name_servers}" ] && for d in \${new_dhcp6_name_servers}; do echo "nameserver \${d}%\${interface}" >> /etc/resolv.conf; done
+[ -n "\${new_dhcp6_domain_search}" ] && (printf "search"; for d in \${new_dhcp6_domain_search}; do printf " %s" "\${d}"; done; printf "\n") >> /etc/resolv.conf
+
+[ -n "\${new_host_name}" ] && hostname "\${new_host_name}"
+exit 0
+EOF
+ chmod 755 /sbin/dhclient-script
:> /etc/fstab
sh +m
-"
+'
OUTPUT="KERNEL=__KERNEL__
INITRD=__INITRD__