commit 355c58e485e76a4b91bb4613ee2a3e1bae809d28 · pyrox.dev/nixpkgs

+9 -1

nixos/doc/manual/release-notes/rl-2003.xml

···

       767
       767
        
             </para></listitem>

     

       768
       768
        
            </itemizedlist>

     

       769
       769
        
           </para>

     

       770
       770
       -
          </listitem>

     

       770
       770
       +
         </listitem>

     

       771
       771
       +
         <listitem>

     

       772
       772
       +
          <para>

     

       773
       773
       +
           The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected

     

       774
       774
       +
           even when <link linkend="opt-systemd.network.enable">systemd-networkd</command> is disabled.

     

       775
       775
       +
           This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,

     

       776
       776
       +
           not <command>systemd-networkd</command>.

     

       777
       777
       +
          </para>

     

       778
       778
       +
         </listitem>

     

       771
       779
        
         </itemizedlist>

     

       772
       780
        
        </section>

     

       773
       781
        
       </section>

+44 -31

nixos/modules/system/boot/networkd.nix

···

       355
       355
        
         };

     

       356
       356
        
       

     

       357
       357
        
         linkOptions = commonNetworkOptions // {

     

       358
       358
       +
           # overwrite enable option from above

     

       359
       359
       +
           enable = mkOption {

     

       360
       360
       +
             default = true;

     

       361
       361
       +
             type = types.bool;

     

       362
       362
       +
             description = ''

     

       363
       363
       +
               Whether to enable this .link unit. It's handled by udev no matter if <command>systemd-networkd</command> is enabled or not

     

       364
       364
       +
             '';

     

       365
       365
       +
           };

     

       358
       366
        
       

     

       359
       367
        
           linkConfig = mkOption {

     

       360
       368
        
             default = {};

     
···

       1045
       1053
        
       

     

       1046
       1054
        
         };

     

       1047
       1055
        
       

     

       1048
       1048
       -
         config = mkIf config.systemd.network.enable {

     

       1056
       1056
       +
         config = mkMerge [

     

       1057
       1057
       +
           # .link units are honored by udev, no matter if systemd-networkd is enabled or not.

     

       1058
       1058
       +
           {

     

       1059
       1059
       +
             systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links;

     

       1060
       1060
       +
             environment.etc = unitFiles;

     

       1061
       1061
       +
           }

     

       1049
       1062
        
       

     

       1050
       1050
       -
           users.users.systemd-network.group = "systemd-network";

     

       1063
       1063
       +
           (mkIf config.systemd.network.enable {

     

       1051
       1064
        
       

     

       1052
       1052
       -
           systemd.additionalUpstreamSystemUnits = [

     

       1053
       1053
       -
             "systemd-networkd.service" "systemd-networkd-wait-online.service"

     

       1054
       1054
       -
           ];

     

       1065
       1065
       +
             users.users.systemd-network.group = "systemd-network";

     

       1055
       1066
        
       

     

       1056
       1056
       -
           systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links

     

       1057
       1057
       -
             // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs

     

       1058
       1058
       -
             // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;

     

       1067
       1067
       +
             systemd.additionalUpstreamSystemUnits = [

     

       1068
       1068
       +
               "systemd-networkd.service" "systemd-networkd-wait-online.service"

     

       1069
       1069
       +
             ];

     

       1059
       1070
        
       

     

       1060
       1060
       -
           environment.etc = unitFiles;

     

       1071
       1071
       +
             systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs

     

       1072
       1072
       +
               // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;

     

       1061
       1073
        
       

     

       1062
       1062
       -
           systemd.services.systemd-networkd = {

     

       1063
       1063
       -
             wantedBy = [ "multi-user.target" ];

     

       1064
       1064
       -
             restartTriggers = attrNames unitFiles;

     

       1065
       1065
       -
             # prevent race condition with interface renaming (#39069)

     

       1066
       1066
       -
             requires = [ "systemd-udev-settle.service" ];

     

       1067
       1067
       -
             after = [ "systemd-udev-settle.service" ];

     

       1068
       1068
       -
           };

     

       1074
       1074
       +
             systemd.services.systemd-networkd = {

     

       1075
       1075
       +
               wantedBy = [ "multi-user.target" ];

     

       1076
       1076
       +
               restartTriggers = attrNames unitFiles;

     

       1077
       1077
       +
               # prevent race condition with interface renaming (#39069)

     

       1078
       1078
       +
               requires = [ "systemd-udev-settle.service" ];

     

       1079
       1079
       +
               after = [ "systemd-udev-settle.service" ];

     

       1080
       1080
       +
             };

     

       1069
       1081
        
       

     

       1070
       1070
       -
           systemd.services.systemd-networkd-wait-online = {

     

       1071
       1071
       -
             wantedBy = [ "network-online.target" ];

     

       1072
       1072
       -
           };

     

       1082
       1082
       +
             systemd.services.systemd-networkd-wait-online = {

     

       1083
       1083
       +
               wantedBy = [ "network-online.target" ];

     

       1084
       1084
       +
             };

     

       1073
       1085
        
       

     

       1074
       1074
       -
           systemd.services."systemd-network-wait-online@" = {

     

       1075
       1075
       -
             description = "Wait for Network Interface %I to be Configured";

     

       1076
       1076
       -
             conflicts = [ "shutdown.target" ];

     

       1077
       1077
       -
             requisite = [ "systemd-networkd.service" ];

     

       1078
       1078
       -
             after = [ "systemd-networkd.service" ];

     

       1079
       1079
       -
             serviceConfig = {

     

       1080
       1080
       -
               Type = "oneshot";

     

       1081
       1081
       -
               RemainAfterExit = true;

     

       1082
       1082
       -
               ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";

     

       1086
       1086
       +
             systemd.services."systemd-network-wait-online@" = {

     

       1087
       1087
       +
               description = "Wait for Network Interface %I to be Configured";

     

       1088
       1088
       +
               conflicts = [ "shutdown.target" ];

     

       1089
       1089
       +
               requisite = [ "systemd-networkd.service" ];

     

       1090
       1090
       +
               after = [ "systemd-networkd.service" ];

     

       1091
       1091
       +
               serviceConfig = {

     

       1092
       1092
       +
                 Type = "oneshot";

     

       1093
       1093
       +
                 RemainAfterExit = true;

     

       1094
       1094
       +
                 ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";

     

       1095
       1095
       +
               };

     

       1083
       1096
        
             };

     

       1084
       1084
       -
           };

     

       1085
       1097
        
       

     

       1086
       1086
       -
           services.resolved.enable = mkDefault true;

     

       1087
       1087
       -
         };

     

       1098
       1098
       +
             services.resolved.enable = mkDefault true;

     

       1099
       1099
       +
           })

     

       1100
       1100
       +
         ];

     

       1088
       1101
        
       }

+25

nixos/tests/networking.nix

···

       655
       655
        
                   ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)

     

       656
       656
        
             '';

     

       657
       657
        
           };

     

       658
       658
       +
           # even with disabled networkd, systemd.network.links should work

     

       659
       659
       +
           # (as it's handled by udev, not networkd)

     

       660
       660
       +
           link = {

     

       661
       661
       +
             name = "Link";

     

       662
       662
       +
             nodes.client = { pkgs, ... }: {

     

       663
       663
       +
               virtualisation.vlans = [ 1 ];

     

       664
       664
       +
               networking = {

     

       665
       665
       +
                 useNetworkd = networkd;

     

       666
       666
       +
                 useDHCP = false;

     

       667
       667
       +
               };

     

       668
       668
       +
               systemd.network.links."50-foo" = {

     

       669
       669
       +
                 matchConfig = {

     

       670
       670
       +
                   Name = "foo";

     

       671
       671
       +
                   Driver = "dummy";

     

       672
       672
       +
                 };

     

       673
       673
       +
                 linkConfig.MTUBytes = "1442";

     

       674
       674
       +
               };

     

       675
       675
       +
             };

     

       676
       676
       +
             testScript = ''

     

       677
       677
       +
               print(client.succeed("ip l add name foo type dummy"))

     

       678
       678
       +
               print(client.succeed("stat /etc/systemd/network/50-foo.link"))

     

       679
       679
       +
               client.succeed("udevadm settle")

     

       680
       680
       +
               assert "mtu 1442" in client.succeed("ip l show dummy0")

     

       681
       681
       +
             '';

     

       682
       682
       +
           };

     

       658
       683
        
         };

     

       659
       684
        
       

     

       660
       685
        
       in mapAttrs (const (attrs: makeTest (attrs // {