public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Installer test: Remove apparently useless setting of nix.readOnlyStore

Browse Source
This commit is contained in:
Eelco Dolstra 2015-06-10 15:18:54 +02:00
parent d906939e74
commit 8e88710693
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/installer.nix
View File

@ -8,7 +8,7 @@ let
# The configuration to install. # The configuration to install.
makeConfig = { grubVersion, grubDevice, grubIdentifier makeConfig = { grubVersion, grubDevice, grubIdentifier
, extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 , extraConfig, forceGrubReinstallCount ? 0
}: }:
pkgs.writeText "configuration.nix" '' pkgs.writeText "configuration.nix" ''
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
@ -28,8 +28,6 @@ let
boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
${optionalString (!readOnly) "nix.readOnlyStore = false;"}
hardware.enableAllFirmware = lib.mkForce false; hardware.enableAllFirmware = lib.mkForce false;
${replaceChars ["\n"] ["\n "] extraConfig} ${replaceChars ["\n"] ["\n "] extraConfig}
@ -116,7 +114,7 @@ let
# We need to a writable nix-store on next boot. # We need to a writable nix-store on next boot.
$machine->copyFileFromHost( $machine->copyFileFromHost(
"${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
"/etc/nixos/configuration.nix"); "/etc/nixos/configuration.nix");
# Check whether nixos-rebuild works. # Check whether nixos-rebuild works.
@ -134,7 +132,7 @@ let
${preBootCommands} ${preBootCommands}
$machine->waitForUnit("multi-user.target"); $machine->waitForUnit("multi-user.target");
$machine->copyFileFromHost( $machine->copyFileFromHost(
"${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
"/etc/nixos/configuration.nix"); "/etc/nixos/configuration.nix");
$machine->succeed("nixos-rebuild boot >&2"); $machine->succeed("nixos-rebuild boot >&2");
$machine->shutdown; $machine->shutdown;