commit 045fbc389f8cd075a0f26840f3f68f79b857a285 · pyrox.dev/nixpkgs

+28 -2
nixos/modules/system/boot/systemd/tmpfiles.nix
···

       18
       18
        
             inherit elemType placeholder;

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
       +
         escapeArgument = lib.strings.escapeC [

     

       22
       22
       +
           "\t"

     

       23
       23
       +
           "\n"

     

       24
       24
       +
           "\r"

     

       25
       25
       +
           " "

     

       26
       26
       +
           "\\"

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       21
       29
        
         settingsOption = {

     

       22
       30
        
           description = ''

     

       23
       31
        
             Declare systemd-tmpfiles rules to create, delete, and clean up volatile

     
···

       126
       134
        
       

     

       127
       135
        
         # generates a single entry for a tmpfiles.d rule

     

       128
       136
        
         settingsEntryToRule = path: entry: ''

     

       129
       129
       -
           '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument}

     

       137
       137
       +
           '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${escapeArgument entry.argument}

     

       130
       138
        
         '';

     

       131
       139
        
       

     

       132
       140
        
         # generates a list of tmpfiles.d rules from the attrs (paths) under tmpfiles.settings.<name>

     
···

       199
       207
        
                 "boot.initrd.systemd.storePaths will lead to errors in the future."

     

       200
       208
        
                 "Found these problematic files: ${lib.concatStringsSep ", " paths}"

     

       201
       209
        
               ]

     

       202
       202
       -
             );

     

       210
       210
       +
             )

     

       211
       211
       +
             ++ (lib.flatten (

     

       212
       212
       +
               lib.mapAttrsToList (

     

       213
       213
       +
                 name: paths:

     

       214
       214
       +
                 lib.mapAttrsToList (

     

       215
       215
       +
                   path: entries:

     

       216
       216
       +
                   lib.mapAttrsToList (

     

       217
       217
       +
                     type': entry:

     

       218
       218
       +
                     lib.optional (lib.match ''.*\\([nrt]|x[0-9A-Fa-f]{2}).*'' entry.argument != null) (

     

       219
       219
       +
                       lib.concatStringsSep " " [

     

       220
       220
       +
                         "The argument option of ${name}.${type'}.${path} appears to"

     

       221
       221
       +
                         "contain escape sequences, which will be escaped again."

     

       222
       222
       +
                         "Unescape them if this is not intended: \"${entry.argument}\""

     

       223
       223
       +
                       ]

     

       224
       224
       +
                     )

     

       225
       225
       +
                   ) entries

     

       226
       226
       +
                 ) paths

     

       227
       227
       +
               ) cfg.settings

     

       228
       228
       +
             ));

     

       203
       229
        
       

     

       204
       230
        
           systemd.additionalUpstreamSystemUnits = [

     

       205
       231
        
             "systemd-tmpfiles-clean.service"