diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2022-06-10 12:32:43 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-06-15 09:38:10 +0200 |
| commit | ca0c33ae5b8a68806dd1c766e2f58ce24867f334 (patch) | |
| tree | bdabe0027c287d1b3d2617a175b66f281dc389c6 /test/dhcp | |
| parent | 2320ac3349789551e9c7500dba03e04b9ac02f41 (diff) | |
| download | passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar.gz passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar.bz2 passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar.lz passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar.xz passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.tar.zst passt-ca0c33ae5b8a68806dd1c766e2f58ce24867f334.zip | |
Tweak dhclient arguments for readability
A number of tests and examples use dhclient in both IPv4 and IPv6 modes.
We use "dhclient -6" for IPv6, but usually just "dhclient" for IPv4. Add
an explicit "-4" argument to make it more clear and explicit.
In addition, when dhclient is run from within pasta it usually won't be
"real" root, and so will not have access to write the default global pid
file. This results in a mostly harmless but irritating error:
Can't create /var/run/dhclient.pid: Permission denied
We can avoid that by using the --no-pid flag to dhclient.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/dhcp')
| -rw-r--r-- | test/dhcp/passt | 2 | ||||
| -rw-r--r-- | test/dhcp/pasta | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/dhcp/passt b/test/dhcp/passt index ca76846..4648821 100644 --- a/test/dhcp/passt +++ b/test/dhcp/passt @@ -21,7 +21,7 @@ hout HOST_IFNAME ip -j -4 route show|jq -rM '.[] | select(.dst == "default").dev check [ -n "__IFNAME__" ] test DHCP: address -guest /sbin/dhclient __IFNAME__ +guest /sbin/dhclient -4 __IFNAME__ gout 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 == "__HOST_IFNAME__").addr_info[0].local' check [ "__ADDR__" = "__HOST_ADDR__" ] diff --git a/test/dhcp/pasta b/test/dhcp/pasta index 77e9e42..e76454a 100644 --- a/test/dhcp/pasta +++ b/test/dhcp/pasta @@ -35,7 +35,7 @@ nsout MTU ip -j link show | jq -rM '.[] | select(.ifname == "__IFNAME__").mtu' check [ __MTU__ = 65520 ] test DHCPv6: address -ns /sbin/dhclient -6 __IFNAME__ +ns /sbin/dhclient -6 --no-pid __IFNAME__ nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.prefixlen == 128).local' hout HOST_ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local' check [ __ADDR6__ = __HOST_ADDR6__ ] |