commit 0cb487ee044bbe5cfa1d6421df385b6bc2447bd2 · pyrox.dev/nixpkgs

+10 -6

nixos/modules/tasks/network-interfaces-scripted.nix

···

       102
       102
        
                       EOF

     

       103
       103
        
       

     

       104
       104
        
                       # Set the default gateway.

     

       105
       105
       -
                       ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") ''

     

       105
       105
       +
                       ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''

     

       106
       106
        
                         # FIXME: get rid of "|| true" (necessary to make it idempotent).

     

       107
       107
       -
                         ip route add default via "${cfg.defaultGateway}" ${

     

       107
       107
       +
                         ip route add default via "${cfg.defaultGateway.address}" ${

     

       108
       108
        
                           optionalString (cfg.defaultGatewayWindowSize != null)

     

       109
       109
       -
                             "window ${toString cfg.defaultGatewayWindowSize}"} || true

     

       109
       109
       +
                             "window ${toString cfg.defaultGatewayWindowSize}"} ${

     

       110
       110
       +
                           optionalString (cfg.defaultGateway.interface != null)

     

       111
       111
       +
                             "dev ${cfg.defaultGateway.interface}"}|| true

     

       110
       112
        
                       ''}

     

       111
       111
       -
                       ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") ''

     

       113
       113
       +
                       ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''

     

       112
       114
        
                         # FIXME: get rid of "|| true" (necessary to make it idempotent).

     

       113
       113
       -
                         ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${

     

       115
       115
       +
                         ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${

     

       114
       116
        
                           optionalString (cfg.defaultGatewayWindowSize != null)

     

       115
       115
       -
                             "window ${toString cfg.defaultGatewayWindowSize}"} || true

     

       117
       117
       +
                             "window ${toString cfg.defaultGatewayWindowSize}"} ${

     

       118
       118
       +
                           optionalString (cfg.defaultGateway6.interface != null)

     

       119
       119
       +
                             "dev ${cfg.defaultGateway6.interface}"} || true

     

       116
       120
        
                       ''}

     

       117
       121
        
                     '';

     

       118
       122
        
                 };

nixos/modules/tasks/network-interfaces-systemd.nix

···

       38
       38
        
           } {

     

       39
       39
        
             assertion = cfg.vswitches == {};

     

       40
       40
        
             message = "networking.vswichtes are not supported by networkd.";

     

       41
       41
       +
           } {

     

       42
       42
       +
             assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null;

     

       43
       43
       +
             message = "networking.defaultGateway.interface is not supported by networkd.";

     

       44
       44
       +
           } {

     

       45
       45
       +
             assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;

     

       46
       46
       +
             message = "networking.defaultGateway6.interface is not supported by networkd.";

     

       41
       47
        
           } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {

     

       42
       48
        
             assertion = !rstp;

     

       43
       49
        
             message = "networking.bridges.${n}.rstp is not supported by networkd.";

+36 -6

nixos/modules/tasks/network-interfaces.nix

···

       116
       116
        
             };

     

       117
       117
        
           };

     

       118
       118
        
       

     

       119
       119
       +
         gatewayCoerce = address: { inherit address; };

     

       120
       120
       +
       

     

       121
       121
       +
         gatewayOpts = { ... }: {

     

       122
       122
       +
       

     

       123
       123
       +
           options = {

     

       124
       124
       +
       

     

       125
       125
       +
             address = mkOption {

     

       126
       126
       +
               type = types.str;

     

       127
       127
       +
               description = "The default gateway address.";

     

       128
       128
       +
             };

     

       129
       129
       +
       

     

       130
       130
       +
             interface = mkOption {

     

       131
       131
       +
               type = types.nullOr types.str;

     

       132
       132
       +
               default = null;

     

       133
       133
       +
               example = "enp0s3";

     

       134
       134
       +
               description = "The default gateway interface.";

     

       135
       135
       +
             };

     

       136
       136
       +
       

     

       137
       137
       +
           };

     

       138
       138
       +
       

     

       139
       139
       +
         };

     

       140
       140
       +
       

     

       119
       141
        
         interfaceOpts = { name, ... }: {

     

       120
       142
        
       

     

       121
       143
        
           options = {

     
···

       327
       349
        
       

     

       328
       350
        
           networking.defaultGateway = mkOption {

     

       329
       351
        
             default = null;

     

       330
       330
       -
             example = "131.211.84.1";

     

       331
       331
       -
             type = types.nullOr types.str;

     

       352
       352
       +
             example = {

     

       353
       353
       +
               address = "131.211.84.1";

     

       354
       354
       +
               device = "enp3s0";

     

       355
       355
       +
             };

     

       356
       356
       +
             type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));

     

       332
       357
        
             description = ''

     

       333
       333
       -
               The default gateway.  It can be left empty if it is auto-detected through DHCP.

     

       358
       358
       +
               The default gateway. It can be left empty if it is auto-detected through DHCP.

     

       359
       359
       +
               It can be specified as a string or an option set along with a network interface.

     

       334
       360
        
             '';

     

       335
       361
        
           };

     

       336
       362
        
       

     

       337
       363
        
           networking.defaultGateway6 = mkOption {

     

       338
       364
        
             default = null;

     

       339
       339
       -
             example = "2001:4d0:1e04:895::1";

     

       340
       340
       -
             type = types.nullOr types.str;

     

       365
       365
       +
             example = {

     

       366
       366
       +
               address = "2001:4d0:1e04:895::1";

     

       367
       367
       +
               device = "enp3s0";

     

       368
       368
       +
             };

     

       369
       369
       +
             type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));

     

       341
       370
        
             description = ''

     

       342
       342
       -
               The default ipv6 gateway.  It can be left empty if it is auto-detected through DHCP.

     

       371
       371
       +
               The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP.

     

       372
       372
       +
               It can be specified as a string or an option set along with a network interface.

     

       343
       373
        
             '';

     

       344
       374
        
           };

     

       345
       375