gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Raito Bezarius
2023-04-28 23:50:44 +02:00
parent 77c0b522b7
commit a22826f46a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/lib/make-multi-disk-zfs-image.nix
View File

@@ -261,8 +261,8 @@ let
mv $bootDiskImage $out/${bootFilename} mv $bootDiskImage $out/${bootFilename}
mv $rootDiskImage $out/${rootFilename} mv $rootDiskImage $out/${rootFilename}
'' else '' '' else ''
${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} ${pkgs.qemu_kvm}/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} $rootDiskImage $out/${rootFilename}
''} ''}
bootDiskImage=$out/${bootFilename} bootDiskImage=$out/${bootFilename}
rootDiskImage=$out/${rootFilename} rootDiskImage=$out/${rootFilename}

2
nixos/lib/make-single-disk-zfs-image.nix
View File

@@ -244,7 +244,7 @@ let
${if formatOpt == "raw" then '' ${if formatOpt == "raw" then ''
mv $rootDiskImage $out/${rootFilename} mv $rootDiskImage $out/${rootFilename}
'' else '' '' 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} rootDiskImage=$out/${rootFilename}
set -x set -x