Unverified Commit 99ca8d4e authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #300757 from K900/installer-tests-unfucking 

nixos/tests/installer: spring cleaning
parents 34b2972b 15d95c7b

nixos/lib/testing/meta.nix

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ in 
              Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.

            '';

          };

          platforms = lib.mkOption {

            type = types.listOf types.raw;

            default = lib.platforms.linux;

            description = ''

              Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.

            '';

          };

        };

      };

      default = {};

nixos/modules/virtualisation/qemu-vm.nix

+8 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ let 
        NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")

        # VM needs writable EFI vars

        if ! test -e "$NIX_EFI_VARS"; then

        ${if cfg.useBootLoader then

        ${if cfg.efi.keepVariables then

            # We still need the EFI var from the make-disk-image derivation

            # because our "switch-to-configuration" process might

            # write into it and we want to keep this data.
@@ -905,6 +905,13 @@ in 
            Defaults to OVMF.

          '';

      };



      keepVariables = mkOption {

        type = types.bool;

        default = cfg.useBootLoader;

        defaultText = literalExpression "cfg.useBootLoader";

        description = "Whether to keep EFI variable values from the generated system image";

      };

    };



    virtualisation.tpm = {

nixos/tests/installer.nix

+189 −214

File changed.

Preview size limit exceeded, changes collapsed.