Commit a22826f4 authored by Raito Bezarius's avatar Raito Bezarius
Browse files

nixos/lib/make-(multi|single)-disk-zfs-image: use qemu_kvm (host arch) instead of qemu (all arches)

parent 77c0b522

nixos/lib/make-multi-disk-zfs-image.nix

+2 −2
Original line number Diff line number Diff line
@@ -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}

nixos/lib/make-single-disk-zfs-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -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