commit 1860ee27b0e4aae2cc0ed997e14b0d3289ce498f · pyrox.dev/nixpkgs

+4 -2

nixos/modules/config/networking.nix

···

       112
       112
        
                 ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd

     

       113
       113
        
               ''}

     

       114
       114
        
       

     

       115
       115
       -
               # Make sure resolv.conf is up to date

     

       116
       116
       -
               ${pkgs.openresolv}/bin/resolvconf -u

     

       115
       115
       +
               # Make sure resolv.conf is up to date if not managed by systemd

     

       116
       116
       +
               ${optionalString (!config.services.resolved.enable) ''

     

       117
       117
       +
                 ${pkgs.openresolv}/bin/resolvconf -u

     

       118
       118
       +
               ''}

     

       117
       119
        
             '';

     

       118
       120
        
       

     

       119
       121
        
         };

+2 -2

nixos/modules/services/networking/chrony.nix

···

       99
       99
        
           jobs.chronyd =

     

       100
       100
        
             { description = "chrony daemon";

     

       101
       101
        
       

     

       102
       102
       -
               wantedBy = [ "ip-up.target" ];

     

       103
       103
       -
               partOf = [ "ip-up.target" ];

     

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

     

       103
       103
       +
               after = [ "network.target" ];

     

       104
       104
        
       

     

       105
       105
        
               path = [ chrony ];

     

       106
       106

+3 -3

nixos/modules/services/networking/dhcpcd.nix

···

       15
       15
        
         # Don't start dhcpcd on explicitly configured interfaces or on

     

       16
       16
        
         # interfaces that are part of a bridge, bond or sit device.

     

       17
       17
        
         ignoredInterfaces =

     

       18
       18
       -
           map (i: i.name) (filter (i: if i.useDHCP != null then i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces)

     

       18
       18
       +
           map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces)

     

       19
       19
        
           ++ mapAttrsToList (i: _: i) config.networking.sits

     

       20
       20
        
           ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))

     

       21
       21
        
           ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))

     
···

       28
       28
        
         # If dhcp is disabled but explicit interfaces are enabled,

     

       29
       29
        
         # we need to provide dhcp just for those interfaces.

     

       30
       30
        
         allowInterfaces = arrayAppendOrNull cfg.allowInterfaces

     

       31
       31
       -
           (if !cfg.useDHCP && enableDHCP then map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null);

     

       31
       31
       +
           (if !config.networking.useDHCP && enableDHCP then

     

       32
       32
       +
             map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null);

     

       32
       33
        
       

     

       33
       34
        
         # Config file adapted from the one that ships with dhcpcd.

     

       34
       35
        
         dhcpcdConf = pkgs.writeText "dhcpcd.conf"

     
···

       71
       72
        
                 ${config.systemd.package}/bin/systemctl try-restart ntpd.service

     

       72
       73
        
       

     

       73
       74
        
                 ${config.systemd.package}/bin/systemctl start ip-up.target

     

       74
       74
       -
                 ${config.systemd.package}/bin/systemctl start network-online.target

     

       75
       75
        
             fi

     

       76
       76
        
       

     

       77
       77
        
             #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then

+1 -2

nixos/modules/services/networking/gogoclient.nix

···

       76
       76
        
               exec ${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf

     

       77
       77
        
             '';

     

       78
       78
        
           } // optionalAttrs cfg.autorun {

     

       79
       79
       -
             wantedBy = [ "ip-up.target" ];

     

       80
       80
       -
             partOf = [ "ip-up.target" ];

     

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

     

       81
       80
        
           };

     

       82
       81
        
       

     

       83
       82
        
         };

+1 -2

nixos/modules/services/networking/ntpd.nix

···

       76
       76
        
           jobs.ntpd =

     

       77
       77
        
             { description = "NTP Daemon";

     

       78
       78
        
       

     

       79
       79
       -
               wantedBy = [ "ip-up.target" ];

     

       80
       80
       -
               partOf = [ "ip-up.target" ];

     

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

     

       81
       80
        
       

     

       82
       81
        
               path = [ ntp ];

     

       83
       82

+1 -2

nixos/modules/services/networking/openntpd.nix

···

       41
       41
        
       

     

       42
       42
        
           systemd.services.openntpd = {

     

       43
       43
        
             description = "OpenNTP Server";

     

       44
       44
       -
             wantedBy = [ "ip-up.target" ];

     

       45
       45
       -
             partOf = [ "ip-up.target" ];

     

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

     

       46
       45
        
             serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile}";

     

       47
       46
        
           };

     

       48
       47
        
         };

-2

nixos/modules/system/boot/stage-2-init.sh

···

       141
       141
        
       # Use /etc/resolv.conf supplied by systemd-nspawn, if applicable.

     

       142
       142
        
       if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then

     

       143
       143
        
           cat /etc/resolv.conf | resolvconf -m 1000 -a host

     

       144
       144
       -
       else

     

       145
       145
       -
           touch /etc/resolv.conf

     

       146
       144
        
       fi

     

       147
       145
        
       

     

       148
       146

+2

nixos/modules/system/boot/systemd.nix

···

       945
       945
        
               unitConfig.X-StopOnReconfiguration = true;

     

       946
       946
        
             };

     

       947
       947
        
       

     

       948
       948
       +
           systemd.targets.network-online.after = [ "ip-up.target" ];

     

       949
       949
       +
       

     

       948
       950
        
           systemd.units =

     

       949
       951
        
             mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets

     

       950
       952
        
             // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services

+2 -4

nixos/modules/tasks/filesystems/nfs.nix

···

       73
       73
        
       

     

       74
       74
        
               path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ];

     

       75
       75
        
       

     

       76
       76
       -
               wantedBy = [ "network-online.target" "multi-user.target" ];

     

       77
       77
       -
               before = [ "network-online.target" ];

     

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

     

       78
       77
        
               requires = [ "basic.target" "rpcbind.service" ];

     

       79
       78
        
               after = [ "basic.target" "rpcbind.service" "network.target" ];

     

       80
       79
        
       

     
···

       100
       99
        
       

     

       101
       100
        
               path = [ pkgs.sysvtools pkgs.utillinux ];

     

       102
       101
        
       

     

       103
       103
       -
               wantedBy = [ "network-online.target" "multi-user.target" ];

     

       104
       104
       -
               before = [ "network-online.target" ];

     

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

     

       105
       103
        
               requires = [ "rpcbind.service" ];

     

       106
       104
        
               after = [ "rpcbind.service" ];

     

       107
       105

+1 -1

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

···

       114
       114
        
                   after = [ (subsystemDevice i.name) ];

     

       115
       115
        
                   serviceConfig.Type = "oneshot";

     

       116
       116
        
                   serviceConfig.RemainAfterExit = true;

     

       117
       117
       +
                   path = [ pkgs.iproute ];

     

       117
       118
        
                   script =

     

       118
       119
        
                     ''

     

       119
       120
        
                       echo "bringing up interface..."

     
···

       142
       143
        
                           ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service

     

       143
       144
        
                         fi

     

       144
       145
        
                         ${config.systemd.package}/bin/systemctl start ip-up.target

     

       145
       145
       -
                         ${config.systemd.package}/bin/systemctl start network-online.target

     

       146
       146
        
                       '';

     

       147
       147
        
                   preStop =

     

       148
       148
        
                     ''

+3 -3

nixos/modules/tasks/network-interfaces.nix

···

       624
       624
        
               pkgs.iw

     

       625
       625
        
               pkgs.rfkill

     

       626
       626
        
               pkgs.openresolv

     

       627
       627
       -
             ]

     

       627
       627
       +
             ];

     

       628
       628
        
       

     

       629
       629
        
           systemd.services = {

     

       630
       630
        
             network-local-commands = {

     

       631
       631
        
               description = "Extra networking commands.";

     

       632
       632
       -
               before = [ "network.target" "network-online.target" ];

     

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

     

       632
       632
       +
               before = [ "network.target" ];

     

       633
       633
       +
               wantedBy = [ "network.target" ];

     

       634
       634
        
               unitConfig.ConditionCapability = "CAP_NET_ADMIN";

     

       635
       635
        
               path = [ pkgs.iproute ];

     

       636
       636
        
               serviceConfig.Type = "oneshot";