yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

installation: fix correct binary on aarch64

Browse Source
This commit is contained in:
Jörg Thalheim
2024-12-06 15:04:23 +01:00
committed by Mic92
parent b65244e883
commit d16947f288
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
checks/installation/flake-module.nix
View File

@@ -1,4 +1,9 @@
{ self, lib, ... }: {
self,
inputs,
lib,
...
}:
{ {
clan.machines.test-install-machine = { clan.machines.test-install-machine = {
clan.core.networking.targetHost = "test-install-machine"; clan.core.networking.targetHost = "test-install-machine";
@@ -42,6 +47,7 @@
pkgs.nixos-anywhere pkgs.nixos-anywhere
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
qemu-common = import "${inputs.nixpkgs}/nixos/lib/qemu-common.nix" { inherit lib pkgs; };
in in
{ {
checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) { checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) {
@@ -86,7 +92,7 @@
testScript = '' testScript = ''
def create_test_machine(oldmachine=None, args={}): # taken from <nixpkgs/nixos/tests/installer.nix> def create_test_machine(oldmachine=None, args={}): # taken from <nixpkgs/nixos/tests/installer.nix>
startCommand = "${pkgs.qemu_test}/bin/qemu-kvm" startCommand = "${qemu-common.qemuBinary pkgs.qemu_test}"
startCommand += " -cpu max -m 1024 -virtfs local,path=/nix/store,security_model=none,mount_tag=nix-store" startCommand += " -cpu max -m 1024 -virtfs local,path=/nix/store,security_model=none,mount_tag=nix-store"
startCommand += f' -drive file={oldmachine.state_dir}/empty0.qcow2,id=drive1,if=none,index=1,werror=report' startCommand += f' -drive file={oldmachine.state_dir}/empty0.qcow2,id=drive1,if=none,index=1,werror=report'
startCommand += ' -device virtio-blk-pci,drive=drive1' startCommand += ' -device virtio-blk-pci,drive=drive1'