Commit 5c46e6f4 authored by Will Fancher's avatar Will Fancher
Browse files

systemd-stage-1: Add assertions for unsupported options.

parent 8f9416e9

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

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ in 
        assertion = cfg.loginAll -> cfg.target == null;

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

      }

      {

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

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

      }

    ];

  };

}

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

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ with lib; 


  config = mkIf config.boot.growPartition {



    assertions = [{

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

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

    }];



    boot.initrd.extraUtilsCommands = ''

      copy_bin_and_libs ${pkgs.gawk}/bin/gawk

      copy_bin_and_libs ${pkgs.gnused}/bin/sed

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

+20 −1
Original line number Diff line number Diff line 
{ lib, config, utils, pkgs, ... }:

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



with lib;
@@ -338,6 +338,25 @@ 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 = [