Unverified Commit 5a7e90bc authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #228801 from NixOS/make-disk-image-faster 

nixos/lib/make-disk-image: do not compile a full arch QEMU to convert images
parents ca043941 f9d74191

nixos/lib/make-disk-image.nix

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

  '';

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

nixos/maintainers/scripts/ec2/amazon-image.nix

+3 −3
Original line number Diff line number Diff line
@@ -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" \

          '{}

nixos/maintainers/scripts/openstack/openstack-image-zfs.nix

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

         '{}