commit 663f1d8ba2753ce68fcf7f9ef8198b4c35d13558 · pyrox.dev/nixpkgs

+13 -2
nixos/modules/installer/sd-card/sd-image.nix
···

       26
       26
        
             inherit (config.sdImage) storePaths;

     

       27
       27
        
             compressImage = config.sdImage.compressImage;

     

       28
       28
        
             populateImageCommands = config.sdImage.populateRootCommands;

     

       29
       29
       -
             volumeLabel = "NIXOS_SD";

     

       29
       29
       +
             volumeLabel = config.sdImage.rootVolumeLabel;

     

       30
       30
        
           }

     

       31
       31
        
           // optionalAttrs (config.sdImage.rootPartitionUUID != null) {

     

       32
       32
        
             uuid = config.sdImage.rootPartitionUUID;

     
···

       117
       117
        
             '';

     

       118
       118
        
           };

     

       119
       119
        
       

     

       120
       120
       +
           rootVolumeLabel = mkOption {

     

       121
       121
       +
             type = types.str;

     

       122
       122
       +
             default = "NIXOS_SD";

     

       123
       123
       +
             example = "NIXOS_PENDRIVE";

     

       124
       124
       +
             description = ''

     

       125
       125
       +
               Label for the NixOS root volume.

     

       126
       126
       +
               Usually used when creating a recovery NixOS media installation

     

       127
       127
       +
               that avoids conflicting with previous instalation label.

     

       128
       128
       +
             '';

     

       129
       129
       +
           };

     

       130
       130
       +
       

     

       120
       131
        
           firmwareSize = mkOption {

     

       121
       132
        
             type = types.int;

     

       122
       133
        
             # As of 2019-08-18 the Raspberry pi firmware + u-boot takes ~18MiB

     
···

       197
       208
        
               ];

     

       198
       209
        
             };

     

       199
       210
        
             "/" = {

     

       200
       200
       -
               device = "/dev/disk/by-label/NIXOS_SD";

     

       211
       211
       +
               device = "/dev/disk/by-label/${config.sdImage.rootVolumeLabel}";

     

       201
       212
        
               fsType = "ext4";

     

       202
       213
        
             };

     

       203
       214
        
           };