diff options
| -rw-r--r-- | passt.1 | 12 | ||||
| -rw-r--r-- | test/README.md | 2 | ||||
| -rw-r--r-- | test/dhcp/pasta | 4 | ||||
| -rwxr-xr-x | test/lib/setup | 6 |
4 files changed, 8 insertions, 16 deletions
@@ -479,11 +479,7 @@ NDP/DHCPv6: assign: 2a02:6d40:3ca5:2001:b81d:fa4a:8cdd:cf17 router: fe80::62e3:27ff:fe33:2b01 # -# udhcpc -i eth0 -udhcpc: started, v1.30.1 -udhcpc: sending discover -udhcpc: sending select for 192.168.1.118 -udhcpc: lease of 192.168.1.118 obtained, lease time 4294967295 +# dhclient -4 --no-pid # dhclient -6 --no-pid # ip address show 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000 @@ -576,11 +572,7 @@ NDP/DHCPv6: .fi .BR " [Back to the original terminal]" .nf -# udhcpc -i eth0 -udhcpc: started, v1.30.1 -udhcpc: sending discover -udhcpc: sending select for 192.168.1.118 -udhcpc: lease of 192.168.1.118 obtained, lease time 4294967295 +# dhclient -4 --no-pid # dhclient -6 --no-pid # ip address show 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000 diff --git a/test/README.md b/test/README.md index 623e6e5..362690c 100644 --- a/test/README.md +++ b/test/README.md @@ -29,7 +29,7 @@ on a system, i.e. common utilities such as a shell are not included here. Example for Debian, and possibly most Debian-based distributions: build-essential git jq strace iperf3 qemu-system-x86 tmux sipcalc bc - clang-tidy cppcheck isc-dhcp-common udhcpc psmisc linux-cpupower + clang-tidy cppcheck isc-dhcp-common psmisc linux-cpupower netcat-openbsd fakeroot lz4 lm-sensors qemu-system-arm qemu-system-ppc qemu-system-misc qemu-system-x86 valgrind diff --git a/test/dhcp/pasta b/test/dhcp/pasta index e76454a..4652d09 100644 --- a/test/dhcp/pasta +++ b/test/dhcp/pasta @@ -12,7 +12,7 @@ # Author: Stefano Brivio <sbrivio@redhat.com> onlyfor pasta -nstools ip jq /sbin/udhcpc /sbin/dhclient +nstools ip jq /sbin/dhclient htools ip jq test Interface name @@ -20,7 +20,7 @@ nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifnam check [ -n "__IFNAME__" ] test DHCP: address -ns /sbin/udhcpc -i __IFNAME__ +ns /sbin/dhclient -4 --no-pid __IFNAME__ nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' hout HOST_ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' check [ __ADDR__ = __HOST_ADDR__ ] diff --git a/test/lib/setup b/test/lib/setup index 32515bf..e57d97c 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -144,7 +144,7 @@ setup_passt_in_ns() { pane_run NS "ip -j link show | jq -rM '.[] | select(.link_type == \"ether\").ifname'" pane_wait NS __ifname="$(pane_parse NS)" - pane_run NS "/sbin/udhcpc -i ${__ifname}" + pane_run NS "/sbin/dhclient -4 --no-pid ${__ifname}" pane_status NS sleep 2 pane_run NS "/sbin/dhclient -6 --no-pid ${__ifname}" @@ -232,8 +232,8 @@ setup_two_guests() { pane_wait PASST_1 __ifname="$(pane_parse PASST_1)" - pane_run GUEST_1 "/sbin/udhcpc -i ${__ifname}" - pane_run GUEST_2 "/sbin/udhcpc -i ${__ifname}" + pane_run GUEST_1 "/sbin/dhclient -4 ${__ifname}" + pane_run GUEST_2 "/sbin/dhclient -4 ${__ifname}" pane_status GUEST_1 pane_status GUEST_2 sleep 2 |