commit bf9c6c9861b86e566b1bf22f251194a489b8f97c · pyrox.dev/nixpkgs

+2

nixos/lib/systemd-lib.nix

···

       579
       579
        
             '' else "")

     

       580
       580
        
              + optionalString (def ? stopIfChanged && !def.stopIfChanged) ''

     

       581
       581
        
                X-StopIfChanged=false

     

       582
       582
       +
              '' + optionalString (def ? notSocketActivated && def.notSocketActivated) ''

     

       583
       583
       +
                X-NotSocketActivated=true

     

       582
       584
        
             '' + attrsToSection def.serviceConfig);

     

       583
       585
        
           };

     

       584
       586

+12

nixos/lib/systemd-unit-options.nix

···

       535
       535
        
               '';

     

       536
       536
        
             };

     

       537
       537
        
       

     

       538
       538
       +
             notSocketActivated = mkOption {

     

       539
       539
       +
               type = types.bool;

     

       540
       540
       +
               default = false;

     

       541
       541
       +
               description = ''

     

       542
       542
       +
                 If set, a changed unit is never assumed to be

     

       543
       543
       +
                 socket-activated on configuration activation, even if

     

       544
       544
       +
                 it might have associated socket units. Instead, the unit

     

       545
       545
       +
                 will be restarted (or stopped/started) as if it had no

     

       546
       546
       +
                 associated sockets.

     

       547
       547
       +
               '';

     

       548
       548
       +
             };

     

       549
       549
       +
       

     

       538
       550
        
             startAt = mkOption {

     

       539
       551
        
               type = with types; either str (listOf str);

     

       540
       552
        
               default = [];

+3 -2

nixos/modules/services/hardware/udev.nix

···

       433
       433
        
             fi

     

       434
       434
        
           '';

     

       435
       435
        
       

     

       436
       436
       -
           systemd.services.systemd-udevd =

     

       437
       437
       -
             { restartTriggers = [ config.environment.etc."udev/rules.d".source ];

     

       436
       436
       +
           systemd.services.systemd-udevd = {

     

       437
       437
       +
               restartTriggers = [ config.environment.etc."udev/rules.d".source ];

     

       438
       438
       +
               notSocketActivated = true;

     

       438
       439
        
             };

     

       439
       440
        
       

     

       440
       441
        
         };

+1

nixos/modules/system/boot/networkd.nix

···

       2883
       2883
        
                 config.environment.etc."systemd/networkd.conf".source

     

       2884
       2884
        
               ];

     

       2885
       2885
        
               aliases = [ "dbus-org.freedesktop.network1.service" ];

     

       2886
       2886
       +
               notSocketActivated = true;

     

       2886
       2887
        
             };

     

       2887
       2888
        
       

     

       2888
       2889
        
             networking.iproute2 = mkIf (cfg.config.addRouteTablesToIPRoute2 && cfg.config.routeTables != { }) {

+10

pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs

···

       68
       68
        
       // `stopIfChanged = true` is ignored, switch-to-configuration will handle `restartIfChanged =

     

       69
       69
        
       // false` and `reloadIfChanged = true`. This is the same as specifying a restart trigger in the

     

       70
       70
        
       // NixOS module.

     

       71
       71
       +
       // In addition, switch-to-configuration will handle notSocketActivated=true to disable treatment

     

       72
       72
       +
       // of units as "socket-activated" even though they might have any associated sockets.

     

       71
       73
        
       //

     

       72
       74
        
       // The reload file asks this program to reload a unit. This is the same as specifying a reload

     

       73
       75
        
       // trigger in the NixOS module and can be ignored if the unit is restarted in this activation.

     
···

       583
       585
        
                   } else {

     

       584
       586
        
                       // If this unit is socket-activated, then stop the socket unit(s) as well, and

     

       585
       587
        
                       // restart the socket(s) instead of the service.

     

       588
       588
       +
                       // We count as "socket-activated" any unit that doesn't declare itself not so

     

       589
       589
       +
                       // via X-NotSocketActivated, that has any associated .socket units.

     

       586
       590
        
                       let mut socket_activated = false;

     

       587
       591
        
                       if unit.ends_with(".service") {

     

       588
       592
        
                           let mut sockets = if let Some(Some(Some(sockets))) = new_unit_info.map(|info| {

     
···

       633
       637
        
                                   }

     

       634
       638
        
                               }

     

       635
       639
        
                           }

     

       640
       640
       +
                       }

     

       641
       641
       +
                       if parse_systemd_bool(new_unit_info, "Service", "X-NotSocketActivated", false) {

     

       642
       642
       +
                           // If the unit explicitly opts out of socket

     

       643
       643
       +
                           // activation, restart it as if it weren't (but do

     

       644
       644
       +
                           // restart its sockets, that's fine):

     

       645
       645
       +
                           socket_activated = false;

     

       636
       646
        
                       }

     

       637
       647
        
       

     

       638
       648
        
                       // If the unit is not socket-activated, record that this unit needs to be started