Unverified Commit 136f6ccd authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #227623 from ElvishJerricco/un-assert-initrd-commands 

systemd-stage-1: Revert assertions about initrd commands
parents 088941cc e56084d2

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

+0 −19
Original line number Diff line number Diff line
@@ -338,25 +338,6 @@ in { 
  };



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

    assertions = map (name: {

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

      message = ''

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

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



          Definitions:

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

      '';

    }) [

      "preFailCommands"

      "preDeviceCommands"

      "preLVMCommands"

      "postDeviceCommands"

      "postMountCommands"

      "extraUtilsCommands"

      "extraUtilsCommandsTest"

    ];



    system.build = { inherit initialRamdisk; };



    boot.initrd.availableKernelModules = [