Merge pull request #45912 from xeji/p/dhcpcd

dhcpcd: 6.11.5 -> 7.0.8

1 files changed, 14 insertions, 1 deletions

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index ff088ad2621..02bd4bd9807 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -11,6 +11,7 @@ let
     let
       vlanIfs = range 1 (length config.virtualisation.vlans);
     in {
+      environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
       virtualisation.vlans = [ 1 2 3 ];
       boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
       networking = {
@@ -320,9 +321,14 @@ let
       name = "MACVLAN";
       nodes.router = router;
       nodes.client = { pkgs, ... }: with pkgs.lib; {
+        environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
+          firewall.logReversePathDrops = true; # to debug firewall rules
+          # reverse path filtering rules for the macvlan interface seem
+          # to be incorrect, causing the test to fail. Disable temporarily.
+          firewall.checkReversePath = false;
           firewall.allowPing = true;
           useDHCP = true;
           macvlans.macvlan.interface = "eth1";
@@ -341,9 +347,16 @@ let
           $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
           $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
 
-          # Print diagnosting information
+          # Print lots of diagnostic information
+          $router->log('**********************************************');
           $router->succeed("ip addr >&2");
+          $router->succeed("ip route >&2");
+          $router->execute("iptables-save >&2");
+          $client->log('==============================================');
           $client->succeed("ip addr >&2");
+          $client->succeed("ip route >&2");
+          $client->execute("iptables-save >&2");
+          $client->log('##############################################');
 
           # Test macvlan creates routable ips
           $client->waitUntilSucceeds("ping -c 1 192.168.1.1");