diff options
| author | Artturi <Artturin@artturin.com> | 2021-09-29 16:31:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 16:31:06 +0300 |
| commit | 759ffe33a08863e01511c10eff03e1f3cb8d5711 (patch) | |
| tree | 7ef32d5a9169be5d358d67c57af4786b1c0eca44 /nixos | |
| parent | 4b94ebf26827be1f29c1eb4283d6c2bf0879c2f6 (diff) | |
| parent | b7fa38dcf64c6198c8566c0f0dcb88d2ec7555a9 (diff) | |
| download | nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar.gz nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar.bz2 nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar.lz nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar.xz nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.tar.zst nixpkgs-759ffe33a08863e01511c10eff03e1f3cb8d5711.zip | |
Merge pull request #139890 from Artturin/bootfixflag
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/boot.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index bdae6341ec9..e8440598a82 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -4,10 +4,10 @@ }: with import ../lib/testing-python.nix { inherit system pkgs; }; -with import ../lib/qemu-flags.nix { inherit pkgs; }; with pkgs.lib; let + qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; iso = (import ../lib/eval-config.nix { @@ -23,7 +23,7 @@ let makeBootTest = name: extraConfig: let machineConfig = pythonDict ({ - qemuBinary = qemuBinary pkgs.qemu_test; + qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; qemuFlags = "-m 768"; } // extraConfig); in @@ -65,7 +65,7 @@ let ]; }; machineConfig = pythonDict ({ - qemuBinary = qemuBinary pkgs.qemu_test; + qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; qemuFlags = "-boot order=n -m 2000"; netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe"; } // extraConfig); |