diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-10 15:18:54 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-10 15:28:56 +0200 |
| commit | 8e88710693910f8bac1a6db388113d8a894adac4 (patch) | |
| tree | bff57a48e6c584a77f44305e59360c5726ddde15 /nixos/tests/installer.nix | |
| parent | d906939e74b79318b4493c2085bcfe3f7dd92bb7 (diff) | |
| download | nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar.gz nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar.bz2 nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar.lz nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar.xz nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.tar.zst nixpkgs-8e88710693910f8bac1a6db388113d8a894adac4.zip | |
Installer test: Remove apparently useless setting of nix.readOnlyStore
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 187543ab8e3..4feed56cd67 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -8,7 +8,7 @@ let # The configuration to install. makeConfig = { grubVersion, grubDevice, grubIdentifier - , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + , extraConfig, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -28,8 +28,6 @@ let boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; - ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - hardware.enableAllFirmware = lib.mkForce false; ${replaceChars ["\n"] ["\n "] extraConfig} @@ -116,7 +114,7 @@ let # We need to a writable nix-store on next boot. $machine->copyFileFromHost( - "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -134,7 +132,7 @@ let ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; |