commit f91b6f3581fc3528cad571ce4a111561d1b9a884 · pyrox.dev/nixpkgs

+7 -5
nixos/modules/services/hardware/rasdaemon.nix
···

       14
       14
        
       

     

       15
       15
        
           enable = lib.mkEnableOption "RAS logging daemon";

     

       16
       16
        
       

     

       17
       17
       +
           package = lib.mkPackageOption pkgs "rasdaemon" { };

     

       18
       18
       +
       

     

       17
       19
        
           record = lib.mkOption {

     

       18
       20
        
             type = lib.types.bool;

     

       19
       21
        
             default = true;

     
···

       99
       101
        
             };

     

       100
       102
        
           };

     

       101
       103
        
           environment.systemPackages =

     

       102
       102
       -
             [ pkgs.rasdaemon ]

     

       104
       104
       +
             [ cfg.package ]

     

       103
       105
        
             ++ lib.optionals (cfg.testing) (

     

       104
       106
        
               with pkgs.error-inject;

     

       105
       107
        
               [

     
···

       151
       153
        
                 StateDirectory = lib.optionalString (cfg.record) "rasdaemon";

     

       152
       154
        
       

     

       153
       155
        
                 ExecStart =

     

       154
       154
       -
                   "${pkgs.rasdaemon}/bin/rasdaemon --foreground" + lib.optionalString (cfg.record) " --record";

     

       155
       155
       -
                 ExecStop = "${pkgs.rasdaemon}/bin/rasdaemon --disable";

     

       156
       156
       +
                   "${cfg.package}/bin/rasdaemon --foreground" + lib.optionalString (cfg.record) " --record";

     

       157
       157
       +
                 ExecStop = "${cfg.package}/bin/rasdaemon --disable";

     

       156
       158
        
                 Restart = "on-abort";

     

       157
       159
        
       

     

       158
       160
        
                 # src/misc/rasdaemon.service.in shows this:

     

       159
       159
       -
                 # ExecStartPost = ${pkgs.rasdaemon}/bin/rasdaemon --enable

     

       161
       161
       +
                 # ExecStartPost = ${cfg.package}/bin/rasdaemon --enable

     

       160
       162
        
                 # but that results in unpredictable existence of the database

     

       161
       163
        
                 # and everything seems to be enabled without this...

     

       162
       164
        
               };

     
···

       167
       169
        
               wantedBy = [ "multi-user.target" ];

     

       168
       170
        
               serviceConfig = {

     

       169
       171
        
                 Type = "oneshot";

     

       170
       170
       -
                 ExecStart = "${pkgs.rasdaemon}/bin/ras-mc-ctl --register-labels";

     

       172
       172
       +
                 ExecStart = "${cfg.package}/bin/ras-mc-ctl --register-labels";

     

       171
       173
        
                 RemainAfterExit = true;

     

       172
       174
        
               };

     

       173
       175
        
             };