b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixosTests.os-prober: fix infinite recursion

Browse source
This commit is contained in:
Guillaume Girol 2021-12-09 12:00:00 +00:00
parent 4f984654ee
commit 6f2ed3cd1e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/tests/os-prober.nix
View file

@ -53,12 +53,12 @@ let
}; };
# /etc/nixos/configuration.nix for the vm # /etc/nixos/configuration.nix for the vm
configFile = pkgs.writeText "configuration.nix" '' configFile = pkgs.writeText "configuration.nix" ''
{config, pkgs, ...}: ({ {config, pkgs, lib, ...}: ({
imports = imports =
[ ./hardware-configuration.nix [ ./hardware-configuration.nix
<nixpkgs/nixos/modules/testing/test-instrumentation.nix> <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
]; ];
} // pkgs.lib.importJSON ${ } // lib.importJSON ${
pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig) pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig)
}) })
''; '';
@ -114,7 +114,7 @@ in {
"${configFile}", "${configFile}",
"/etc/nixos/configuration.nix", "/etc/nixos/configuration.nix",
) )
machine.succeed("nixos-rebuild boot >&2") machine.succeed("nixos-rebuild boot --show-trace >&2")
machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg") machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
''; '';