commit a662dc8b7369605e4b8e977d76797be982897b0c · pyrox.dev/nixpkgs

+17

nixos/lib/systemd-lib.nix

···

       443
       443
        
                 ${attrsToSection def.sliceConfig}

     

       444
       444
        
               '';

     

       445
       445
        
           };

     

       446
       446
       +
       

     

       447
       447
       +
         # Create a directory that contains systemd definition files from an attrset

     

       448
       448
       +
         # that contains the file names as keys and the content as values. The values

     

       449
       449
       +
         # in that attrset are determined by the supplied format.

     

       450
       450
       +
         definitions = directoryName: format: definitionAttrs:

     

       451
       451
       +
           let

     

       452
       452
       +
             listOfDefinitions = lib.mapAttrsToList

     

       453
       453
       +
               (name: format.generate "${name}.conf")

     

       454
       454
       +
               definitionAttrs;

     

       455
       455
       +
           in

     

       456
       456
       +
           pkgs.runCommand directoryName { } ''

     

       457
       457
       +
             mkdir -p $out

     

       458
       458
       +
             ${(lib.concatStringsSep "\n"

     

       459
       459
       +
               (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)

     

       460
       460
       +
             )}

     

       461
       461
       +
           '';

     

       462
       462
       +
       

     

       446
       463
        
       }

+6 -19

nixos/modules/system/boot/systemd/repart.nix

···

       1
       1
       -
       { config, pkgs, lib, utils, ... }:

     

       1
       1
       +
       { config, lib, pkgs, utils, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.systemd.repart;

     

       5
       5
        
         initrdCfg = config.boot.initrd.systemd.repart;

     

       6
       6
        
       

     

       7
       7
       -
         writeDefinition = name: partitionConfig: pkgs.writeText

     

       8
       8
       -
           "${name}.conf"

     

       9
       9
       -
           (lib.generators.toINI { } { Partition = partitionConfig; });

     

       7
       7
       +
         format = pkgs.formats.ini { };

     

       10
       8
        
       

     

       11
       11
       -
         listOfDefinitions = lib.mapAttrsToList

     

       12
       12
       -
           writeDefinition

     

       13
       13
       -
           (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.partitions);

     

       14
       14
       -
       

     

       15
       15
       -
         # Create a directory in the store that contains a copy of all definition

     

       16
       16
       -
         # files. This is then passed to systemd-repart in the initrd so it can access

     

       17
       17
       -
         # the definition files after the sysroot has been mounted but before

     

       18
       18
       -
         # activation. This needs a hard copy of the files and not just symlinks

     

       19
       19
       -
         # because otherwise the files do not show up in the sysroot.

     

       20
       20
       -
         definitionsDirectory = pkgs.runCommand "systemd-repart-definitions" { } ''

     

       21
       21
       -
           mkdir -p $out

     

       22
       22
       -
           ${(lib.concatStringsSep "\n"

     

       23
       23
       -
             (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)

     

       24
       24
       -
           )}

     

       25
       25
       -
         '';

     

       9
       9
       +
         definitionsDirectory = utils.systemdUtils.lib.definitions

     

       10
       10
       +
           "repart.d"

     

       11
       11
       +
           format

     

       12
       12
       +
           (lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions);

     

       26
       13
        
       in

     

       27
       14
        
       {

     

       28
       15
        
         options = {

+4 -10

nixos/modules/system/boot/systemd/sysupdate.nix

···

       5
       5
        
       

     

       6
       6
        
         format = pkgs.formats.ini { };

     

       7
       7
        
       

     

       8
       8
       -
         listOfDefinitions = lib.mapAttrsToList

     

       9
       9
       -
           (name: format.generate "${name}.conf")

     

       10
       10
       -
           (lib.filterAttrs (k: _: !(lib.hasPrefix "_" k)) cfg.transfers);

     

       11
       11
       -
       

     

       12
       12
       -
         definitionsDirectory = pkgs.runCommand "sysupdate.d" { } ''

     

       13
       13
       -
           mkdir -p $out

     

       14
       14
       -
           ${(lib.concatStringsSep "\n"

     

       15
       15
       -
             (map (pkg: "cp ${pkg} $out/${pkg.name}") listOfDefinitions)

     

       16
       16
       -
           )}

     

       17
       17
       -
         '';

     

       8
       8
       +
         definitionsDirectory = utils.systemdUtils.lib.definitions

     

       9
       9
       +
           "sysupdate.d"

     

       10
       10
       +
           format

     

       11
       11
       +
           cfg.transfers;

     

       18
       12
        
       in

     

       19
       13
        
       {

     

       20
       14
        
         options.systemd.sysupdate = {