mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
nixos/tests/installer: rename "flake" argument in makeConfig and reverse meaning
to "withTestInstrumentation", which reflects what this argument does
This commit is contained in:
parent
61c719e473
commit
c7b66353bf
@ -11,7 +11,7 @@ let
|
||||
|
||||
# The configuration to install.
|
||||
makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi
|
||||
, extraConfig, forceGrubReinstallCount ? 0, flake ? false
|
||||
, extraConfig, forceGrubReinstallCount ? 0, withTestInstrumentation ? true
|
||||
, clevisTest
|
||||
}:
|
||||
pkgs.writeText "configuration.nix" ''
|
||||
@ -19,7 +19,7 @@ let
|
||||
|
||||
{ imports =
|
||||
[ ./hardware-configuration.nix
|
||||
${if flake
|
||||
${if !withTestInstrumentation
|
||||
then "" # Still included, but via installer/flake.nix
|
||||
else "<nixpkgs/nixos/modules/testing/test-instrumentation.nix>"}
|
||||
];
|
||||
@ -330,7 +330,7 @@ let
|
||||
"${makeConfig {
|
||||
inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest;
|
||||
forceGrubReinstallCount = 1;
|
||||
flake = true;
|
||||
withTestInstrumentation = false;
|
||||
}}",
|
||||
"/root/my-config/configuration.nix",
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user