Unverified Commit 0020a3f6 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #265281 from JulienMalka/systemd-boot-maintainer

parents 127edb71 33df4d34

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

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ let 
  '';

in {



  meta.maintainers = with lib.maintainers; [ julienmalka ];



  imports =

    [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ])

    ];

nixos/tests/systemd-boot.nix

+11 −11
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ in 
{

  basic = makeTest {

    name = "systemd-boot";

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];



    nodes.machine = common;
@@ -42,7 +42,7 @@ in 
  # Check that specialisations create corresponding boot entries.

  specialisation = makeTest {

    name = "systemd-boot-specialisation";

    meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];

    meta.maintainers = with pkgs.lib.maintainers; [ lukegb julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -65,7 +65,7 @@ in 
  # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"

  fallback = makeTest {

    name = "systemd-boot-fallback";

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -91,7 +91,7 @@ in 


  update = makeTest {

    name = "systemd-boot-update";

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];

    meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];



    nodes.machine = common;
@@ -113,7 +113,7 @@ in 


  memtest86 = makeTest {

    name = "systemd-boot-memtest86";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -128,7 +128,7 @@ in 


  netbootxyz = makeTest {

    name = "systemd-boot-netbootxyz";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -143,7 +143,7 @@ in 


  entryFilename = makeTest {

    name = "systemd-boot-entry-filename";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -160,7 +160,7 @@ in 


  extraEntries = makeTest {

    name = "systemd-boot-extra-entries";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -179,7 +179,7 @@ in 


  extraFiles = makeTest {

    name = "systemd-boot-extra-files";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes.machine = { pkgs, lib, ... }: {

      imports = [ common ];
@@ -196,7 +196,7 @@ in 


  switch-test = makeTest {

    name = "systemd-boot-switch-test";

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];

    meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];



    nodes = {

      inherit common;
@@ -256,7 +256,7 @@ in 
  # itself, systems with such firmware won't boot without this fix

  uefiLargeFileWorkaround = makeTest {

    name = "uefi-large-file-workaround";



    meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];

    nodes.machine = { pkgs, ... }: {

      imports = [common];

      virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: {