commit 5c46e6f4e3b517418c64f32c9a0e0c874e81ee8b · pyrox.dev/nixpkgs

+4

nixos/modules/services/networking/iscsi/root-initiator.nix

···

       185
       185
        
               assertion = cfg.loginAll -> cfg.target == null;

     

       186
       186
        
               message = "iSCSI target name is set while login on all portals is enabled.";

     

       187
       187
        
             }

     

       188
       188
       +
             {

     

       189
       189
       +
               assertion = !config.boot.initrd.systemd.enable;

     

       190
       190
       +
               message = "systemd stage 1 does not support iscsi yet.";

     

       191
       191
       +
             }

     

       188
       192
        
           ];

     

       189
       193
        
         };

     

       190
       194
        
       }

+5

nixos/modules/system/boot/grow-partition.nix

···

       17
       17
        
       

     

       18
       18
        
         config = mkIf config.boot.growPartition {

     

       19
       19
        
       

     

       20
       20
       +
           assertions = [{

     

       21
       21
       +
             assertion = !config.boot.initrd.systemd.enable;

     

       22
       22
       +
             message = "systemd stage 1 does not support 'boot.growPartition' yet.";

     

       23
       23
       +
           }];

     

       24
       24
       +
       

     

       20
       25
        
           boot.initrd.extraUtilsCommands = ''

     

       21
       26
        
             copy_bin_and_libs ${pkgs.gawk}/bin/gawk

     

       22
       27
        
             copy_bin_and_libs ${pkgs.gnused}/bin/sed

+20 -1

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

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     
···

       338
       338
        
         };

     

       339
       339
        
       

     

       340
       340
        
         config = mkIf (config.boot.initrd.enable && cfg.enable) {

     

       341
       341
       +
           assertions = map (name: {

     

       342
       342
       +
             assertion = config.boot.initrd.${name} == "";

     

       343
       343
       +
             message = ''

     

       344
       344
       +
               systemd stage 1 does not support 'boot.initrd.${name}'. Please

     

       345
       345
       +
               convert it to analogous systemd units in 'boot.initrd.systemd'.

     

       346
       346
       +
       

     

       347
       347
       +
                 Definitions:

     

       348
       348
       +
                 ${lib.concatMapStringsSep "\n" ({ file, ... }: "- ${file}") options.boot.initrd.${name}.definitionsWithLocations}

     

       349
       349
       +
             '';

     

       350
       350
       +
           }) [

     

       351
       351
       +
             "preFailCommands"

     

       352
       352
       +
             "preDeviceCommands"

     

       353
       353
       +
             "preLVMCommands"

     

       354
       354
       +
             "postDeviceCommands"

     

       355
       355
       +
             "postMountCommands"

     

       356
       356
       +
             "extraUtilsCommands"

     

       357
       357
       +
             "extraUtilsCommandsTest"

     

       358
       358
       +
           ];

     

       359
       359
       +
       

     

       341
       360
        
           system.build = { inherit initialRamdisk; };

     

       342
       361
        
       

     

       343
       362
        
           boot.initrd.availableKernelModules = [