From 77c0b522b7d689294c48fcceb14cb42a39ea5d88 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 28 Apr 2023 23:40:57 +0200 Subject: [PATCH 1/5] nixos/lib/make-disk-image: do not compile a full arch QEMU to convert images --- nixos/lib/make-disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index db53bb98ee4e..33d834e36b44 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -511,7 +511,7 @@ let format' = format; in let ${if format == "raw" then '' mv $diskImage $out/${filename} '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename} + ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename} ''} diskImage=$out/${filename} ''; From a22826f46a93ad5ab08fb2fbf859aa92a58dcc84 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 28 Apr 2023 23:50:44 +0200 Subject: [PATCH 2/5] nixos/lib/make-(multi|single)-disk-zfs-image: use qemu_kvm (host arch) instead of qemu (all arches) --- nixos/lib/make-multi-disk-zfs-image.nix | 4 ++-- nixos/lib/make-single-disk-zfs-image.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index ecbde44971a9..077bb8f22707 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -261,8 +261,8 @@ let mv $bootDiskImage $out/${bootFilename} mv $rootDiskImage $out/${rootFilename} '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} - ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} + ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} ''} bootDiskImage=$out/${bootFilename} rootDiskImage=$out/${rootFilename} diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index ef3b1c0e2842..a3564f9a8b68 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -244,7 +244,7 @@ let ${if formatOpt == "raw" then '' mv $rootDiskImage $out/${rootFilename} '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} ''} rootDiskImage=$out/${rootFilename} set -x From f9c4838812e06e69b14f214879fa3fcff4ddaf6d Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 28 Apr 2023 23:51:07 +0200 Subject: [PATCH 3/5] maintainers/scripts/ec2/amazon-image: use qemu_kvm (host arch) instead of qemu (all arches) --- nixos/maintainers/scripts/ec2/amazon-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 0db0f4d0dcca..6f6bab8dc3d6 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -102,8 +102,8 @@ in { ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${amiBootMode}" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ @@ -142,7 +142,7 @@ in { ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${amiBootMode}" \ --arg file "$diskImage" \ '{} From b69534e0729cbaab649fdbce8643d0760ee42b68 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 28 Apr 2023 23:51:24 +0200 Subject: [PATCH 4/5] maintainers/scripts/openstack/openstack-image-zfs: use qemu_kvm (host arch) instead of qemu (all arches) --- nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index f73e251d3046..936dcee12949 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -85,7 +85,7 @@ in ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_mode "${imageBootMode}" \ --arg root "$rootDisk" \ '{} From f9d741912f30cb0819eb426dca03125b54260bc7 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 28 Apr 2023 23:51:39 +0200 Subject: [PATCH 5/5] nixos/tests/systemd-repart: use qemu_kvm (host arch) instead of qemu (all arches) --- nixos/tests/systemd-repart.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix index 36de5d988fdb..b1d19c2b7cc1 100644 --- a/nixos/tests/systemd-repart.nix +++ b/nixos/tests/systemd-repart.nix @@ -21,7 +21,7 @@ let shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name) subprocess.run([ - "${pkgs.qemu}/bin/qemu-img", + "${machine.config.virtualisation.qemu.package}/bin/qemu-img", "resize", "-f", "raw",