Unverified Commit 2b62672f authored by Julien Malka's avatar Julien Malka Committed by GitHub
Browse files

Merge pull request #320850 from philiptaron/systemd-boot-assertions 

nixos/systemd-boot: guard assertion messages against eval failures
parents aa14af3e faa579e4

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+3 −3
Original line number Diff line number Diff line
@@ -323,15 +323,15 @@ in { 
    assertions = [

      {

        assertion = (hasPrefix "/" efi.efiSysMountPoint);

        message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path";

        message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path";

      }

      {

        assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint);

        message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path";

        message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path";

      }

      {

        assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint;

        message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'";

        message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'";

      }

      {

        assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;