commit 5d07c39b149797c710ff09abda3ad90da231d53e · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

nixos/power-management: fix deadlock with post-resume.{target,service}

Fixes a deadlock where post-resume.target has After=post-resume.service
and post-resume.service runs systemctl try-restart post-resume.target
the systemctl call cannot complete if post-resume.target was already
queued at that time.

Guillaume Girol 3 years ago 5d07c39b d40fea9a

options

unified split

Changed files

+1 -1

nixos

modules

config

power-management.nix

+1 -1

nixos/modules/config/power-management.nix

···

       94
       94
        
               after = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];

     

       95
       95
        
               script =

     

       96
       96
        
                 ''

     

       97
       97
       -
                   /run/current-system/systemd/bin/systemctl try-restart post-resume.target

     

       97
       97
       +
                   /run/current-system/systemd/bin/systemctl try-restart --no-block post-resume.target

     

       98
       98
        
                   ${cfg.resumeCommands}

     

       99
       99
        
                   ${cfg.powerUpCommands}

     

       100
       100
        
                 '';