commit 636e03bef34e2cc9c19becc28a5aff39cf8aeaa1 · pyrox.dev/nixpkgs

+57 -31

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.systemd.repart;

     
···

       26
       26
        
       in

     

       27
       27
        
       {

     

       28
       28
        
         options = {

     

       29
       29
       -
           boot.initrd.systemd.repart.enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // {

     

       30
       30
       -
             description = lib.mdDoc ''

     

       31
       31
       -
               Grow and add partitions to a partition table at boot time in the initrd.

     

       32
       32
       -
               systemd-repart only works with GPT partition tables.

     

       29
       29
       +
           boot.initrd.systemd.repart = {

     

       30
       30
       +
             enable = lib.mkEnableOption (lib.mdDoc "systemd-repart") // {

     

       31
       31
       +
               description = lib.mdDoc ''

     

       32
       32
       +
                 Grow and add partitions to a partition table at boot time in the initrd.

     

       33
       33
       +
                 systemd-repart only works with GPT partition tables.

     

       33
       34
        
       

     

       34
       34
       -
               To run systemd-repart after the initrd, see

     

       35
       35
       -
               `options.systemd.repart.enable`.

     

       36
       36
       -
             '';

     

       35
       35
       +
                 To run systemd-repart after the initrd, see

     

       36
       36
       +
                 `options.systemd.repart.enable`.

     

       37
       37
       +
               '';

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             device = lib.mkOption {

     

       41
       41
       +
               type = with lib.types; nullOr str;

     

       42
       42
       +
               description = lib.mdDoc ''

     

       43
       43
       +
                 The device to operate on.

     

       44
       44
       +
       

     

       45
       45
       +
                 If `device == null`, systemd-repart will operate on the device

     

       46
       46
       +
                 backing the root partition. So in order to dynamically *create* the

     

       47
       47
       +
                 root partition in the initrd you need to set a device.

     

       48
       48
       +
               '';

     

       49
       49
       +
               default = null;

     

       50
       50
       +
               example = "/dev/vda";

     

       51
       51
       +
             };

     

       37
       52
        
           };

     

       38
       53
        
       

     

       39
       54
        
           systemd.repart = {

     
···

       84
       99
        
             contents."/etc/repart.d".source = definitionsDirectory;

     

       85
       100
        
       

     

       86
       101
        
             # Override defaults in upstream unit.

     

       87
       87
       -
             services.systemd-repart = {

     

       88
       88
       -
               # systemd-repart tries to create directories in /var/tmp by default to

     

       89
       89
       -
               # store large temporary files that benefit from persistence on disk. In

     

       90
       90
       -
               # the initrd, however, /var/tmp does not provide more persistence than

     

       91
       91
       -
               # /tmp, so we re-use it here.

     

       92
       92
       -
               environment."TMPDIR" = "/tmp";

     

       93
       93
       -
               serviceConfig = {

     

       94
       94
       -
                 ExecStart = [

     

       95
       95
       -
                   " " # required to unset the previous value.

     

       96
       96
       -
                   # When running in the initrd, systemd-repart by default searches

     

       97
       97
       -
                   # for definition files in /sysroot or /sysusr. We tell it to look

     

       98
       98
       -
                   # in the initrd itself.

     

       99
       99
       -
                   ''${config.boot.initrd.systemd.package}/bin/systemd-repart \

     

       102
       102
       +
             services.systemd-repart =

     

       103
       103
       +
               let

     

       104
       104
       +
                 deviceUnit = "${utils.escapeSystemdPath initrdCfg.device}.device";

     

       105
       105
       +
               in

     

       106
       106
       +
               {

     

       107
       107
       +
                 # systemd-repart tries to create directories in /var/tmp by default to

     

       108
       108
       +
                 # store large temporary files that benefit from persistence on disk. In

     

       109
       109
       +
                 # the initrd, however, /var/tmp does not provide more persistence than

     

       110
       110
       +
                 # /tmp, so we re-use it here.

     

       111
       111
       +
                 environment."TMPDIR" = "/tmp";

     

       112
       112
       +
                 serviceConfig = {

     

       113
       113
       +
                   ExecStart = [

     

       114
       114
       +
                     " " # required to unset the previous value.

     

       115
       115
       +
                     # When running in the initrd, systemd-repart by default searches

     

       116
       116
       +
                     # for definition files in /sysroot or /sysusr. We tell it to look

     

       117
       117
       +
                     # in the initrd itself.

     

       118
       118
       +
                     ''${config.boot.initrd.systemd.package}/bin/systemd-repart \

     

       100
       119
        
                         --definitions=/etc/repart.d \

     

       101
       101
       -
                         --dry-run=no

     

       102
       102
       -
                   ''

     

       103
       103
       -
                 ];

     

       120
       120
       +
                         --dry-run=no ${lib.optionalString (initrdCfg.device != null) initrdCfg.device}

     

       121
       121
       +
                     ''

     

       122
       122
       +
                   ];

     

       123
       123
       +
                 };

     

       124
       124
       +
                 # systemd-repart needs to run after /sysroot (or /sysuser, but we

     

       125
       125
       +
                 # don't have it) has been mounted because otherwise it cannot

     

       126
       126
       +
                 # determine the device (i.e disk) to operate on. If you want to run

     

       127
       127
       +
                 # systemd-repart without /sysroot (i.e. to create the root

     

       128
       128
       +
                 # partition), you have to explicitly tell it which device to operate

     

       129
       129
       +
                 # on. The service then needs to be ordered to run after this device

     

       130
       130
       +
                 # is available.

     

       131
       131
       +
                 requires = lib.mkIf (initrdCfg.device != null) [ deviceUnit ];

     

       132
       132
       +
                 after =

     

       133
       133
       +
                   if initrdCfg.device == null then

     

       134
       134
       +
                     [ "sysroot.mount" ]

     

       135
       135
       +
                   else

     

       136
       136
       +
                     [ deviceUnit ];

     

       104
       137
        
               };

     

       105
       105
       -
               # systemd-repart needs to run after /sysroot (or /sysuser, but we don't

     

       106
       106
       -
               # have it) has been mounted because otherwise it cannot determine the

     

       107
       107
       -
               # device (i.e disk) to operate on. If you want to run systemd-repart

     

       108
       108
       -
               # without /sysroot, you have to explicitly tell it which device to

     

       109
       109
       -
               # operate on.

     

       110
       110
       -
               after = [ "sysroot.mount" ];

     

       111
       111
       -
             };

     

       112
       138
        
           };

     

       113
       139
        
       

     

       114
       140
        
           environment.etc = lib.mkIf cfg.enable {

+60 -2

nixos/tests/systemd-repart.nix

···

       56
       56
        
           # however, creates separate filesystem images without a partition table, so

     

       57
       57
        
           # we have to create a disk image manually.

     

       58
       58
        
           #

     

       59
       59
       -
           # This creates two partitions, an ESP mounted on /dev/vda1 and the root

     

       60
       60
       -
           # partition mounted on /dev/vda2

     

       59
       59
       +
           # This creates two partitions, an ESP available as /dev/vda1 and the root

     

       60
       60
       +
           # partition available as /dev/vda2.

     

       61
       61
        
           system.build.diskImage = import ../lib/make-disk-image.nix {

     

       62
       62
        
             inherit config pkgs lib;

     

       63
       63
        
             # Use a raw format disk so that it can be resized before starting the

     
···

       129
       129
        
       

     

       130
       130
        
             systemd_repart_logs = machine.succeed("journalctl --unit systemd-repart.service")

     

       131
       131
        
             assert "Growing existing partition 1." in systemd_repart_logs

     

       132
       132
       +
           '';

     

       133
       133
       +
         };

     

       134
       134
       +
       

     

       135
       135
       +
         create-root = makeTest {

     

       136
       136
       +
           name = "systemd-repart-create-root";

     

       137
       137
       +
           meta.maintainers = with maintainers; [ nikstur ];

     

       138
       138
       +
       

     

       139
       139
       +
           nodes.machine = { config, lib, pkgs, ... }: {

     

       140
       140
       +
             virtualisation.useDefaultFilesystems = false;

     

       141
       141
       +
             virtualisation.fileSystems = {

     

       142
       142
       +
               "/" = {

     

       143
       143
       +
                 device = "/dev/disk/by-partlabel/created-root";

     

       144
       144
       +
                 fsType = "ext4";

     

       145
       145
       +
               };

     

       146
       146
       +
               "/nix/store" = {

     

       147
       147
       +
                 device = "/dev/vda2";

     

       148
       148
       +
                 fsType = "ext4";

     

       149
       149
       +
               };

     

       150
       150
       +
             };

     

       151
       151
       +
       

     

       152
       152
       +
             # Create an image containing only the Nix store. This enables creating

     

       153
       153
       +
             # the root partition with systemd-repart and then successfully booting

     

       154
       154
       +
             # into a working system.

     

       155
       155
       +
             #

     

       156
       156
       +
             # This creates two partitions, an ESP available as /dev/vda1 and the Nix

     

       157
       157
       +
             # store available as /dev/vda2.

     

       158
       158
       +
             system.build.diskImage = import ../lib/make-disk-image.nix {

     

       159
       159
       +
               inherit config pkgs lib;

     

       160
       160
       +
               onlyNixStore = true;

     

       161
       161
       +
               format = "raw";

     

       162
       162
       +
               bootSize = "32M";

     

       163
       163
       +
               additionalSpace = "0M";

     

       164
       164
       +
               partitionTableType = "efi";

     

       165
       165
       +
               installBootLoader = false;

     

       166
       166
       +
               copyChannel = false;

     

       167
       167
       +
             };

     

       168
       168
       +
       

     

       169
       169
       +
             boot.initrd.systemd.enable = true;

     

       170
       170
       +
       

     

       171
       171
       +
             boot.initrd.systemd.repart.enable = true;

     

       172
       172
       +
             boot.initrd.systemd.repart.device = "/dev/vda";

     

       173
       173
       +
             systemd.repart.partitions = {

     

       174
       174
       +
               "10-root" = {

     

       175
       175
       +
                 Type = "root";

     

       176
       176
       +
                 Label = "created-root";

     

       177
       177
       +
                 Format = "ext4";

     

       178
       178
       +
               };

     

       179
       179
       +
             };

     

       180
       180
       +
           };

     

       181
       181
       +
       

     

       182
       182
       +
           testScript = { nodes, ... }: ''

     

       183
       183
       +
             ${useDiskImage nodes.machine}

     

       184
       184
       +
       

     

       185
       185
       +
             machine.start()

     

       186
       186
       +
             machine.wait_for_unit("multi-user.target")

     

       187
       187
       +
       

     

       188
       188
       +
             systemd_repart_logs = machine.succeed("journalctl --boot --unit systemd-repart.service")

     

       189
       189
       +
             assert "Adding new partition 2 to partition table." in systemd_repart_logs

     

       132
       190
        
           '';

     

       133
       191
        
         };

     

       134
       192
        
       }