diff options
author | Artturin <Artturin@artturin.com> | 2021-09-29 15:27:43 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2021-09-29 15:37:24 +0300 |
commit | c34905f516e6c7e1bb817a4cda37fe8a0b305f45 (patch) | |
tree | 71e83cd8396da30964cad9e3ef9492dd8579834d /nixos/tests/boot.nix | |
parent | af51852adf5556e5627514ee1bcfa5301305f746 (diff) |
nixos/boot: qemu-flags -> qemu-common
and dont use with import ...
Diffstat (limited to 'nixos/tests/boot.nix')
-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 bdae6341ec91f..e8440598a822c 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); |