From c34905f516e6c7e1bb817a4cda37fe8a0b305f45 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 29 Sep 2021 15:27:43 +0300 Subject: [PATCH] nixos/boot: qemu-flags -> qemu-common and dont use with import ... --- nixos/tests/boot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index bdae6341ec91..e8440598a822 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);