commit 5a7e90bc95a9d6202e68719391d13535b977d38a · pyrox.dev/nixpkgs

+1 -1

nixos/lib/make-disk-image.nix

···

       511
        
           ${if format == "raw" then ''

     

       512
        
             mv $diskImage $out/${filename}

     

       513
        
           '' else ''

     

       514
       -
             ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename}

     

       515
        
           ''}

     

       516
        
           diskImage=$out/${filename}

     

       517
        
         '';

···

       511
        
           ${if format == "raw" then ''

     

       512
        
             mv $diskImage $out/${filename}

     

       513
        
           '' else ''

     

       514
       +
             ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O ${format} ${compress} $diskImage $out/${filename}

     

       515
        
           ''}

     

       516
        
           diskImage=$out/${filename}

     

       517
        
         '';

+2 -2

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

···

       261
        
                 mv $bootDiskImage $out/${bootFilename}

     

       262
        
                 mv $rootDiskImage $out/${rootFilename}

     

       263
        
               '' else ''

     

       264
       -
                 ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename}

     

       265
       -
                 ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}

     

       266
        
               ''}

     

       267
        
                 bootDiskImage=$out/${bootFilename}

     

       268
        
                 rootDiskImage=$out/${rootFilename}

···

       261
        
                 mv $bootDiskImage $out/${bootFilename}

     

       262
        
                 mv $rootDiskImage $out/${rootFilename}

     

       263
        
               '' else ''

     

       264
       +
                 ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename}

     

       265
       +
                 ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}

     

       266
        
               ''}

     

       267
        
                 bootDiskImage=$out/${bootFilename}

     

       268
        
                 rootDiskImage=$out/${rootFilename}

+1 -1

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

···

       244
        
                   ${if formatOpt == "raw" then ''

     

       245
        
                   mv $rootDiskImage $out/${rootFilename}

     

       246
        
                 '' else ''

     

       247
       -
                   ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}

     

       248
        
                 ''}

     

       249
        
                   rootDiskImage=$out/${rootFilename}

     

       250
        
                   set -x

···

       244
        
                   ${if formatOpt == "raw" then ''

     

       245
        
                   mv $rootDiskImage $out/${rootFilename}

     

       246
        
                 '' else ''

     

       247
       +
                   ${pkgs.qemu_kvm}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename}

     

       248
        
                 ''}

     

       249
        
                   rootDiskImage=$out/${rootFilename}

     

       250
        
                   set -x

+3 -3

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

···

       102
        
              ${pkgs.jq}/bin/jq -n \

     

       103
        
                --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       104
        
                --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       105
       -
                --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       106
       -
                --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       107
        
                --arg boot_mode "${amiBootMode}" \

     

       108
        
                --arg root "$rootDisk" \

     

       109
        
                --arg boot "$bootDisk" \

     
···

       142
        
              ${pkgs.jq}/bin/jq -n \

     

       143
        
                --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       144
        
                --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       145
       -
                --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       146
        
                --arg boot_mode "${amiBootMode}" \

     

       147
        
                --arg file "$diskImage" \

     

       148
        
                 '{}

···

       102
        
              ${pkgs.jq}/bin/jq -n \

     

       103
        
                --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       104
        
                --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       105
       +
                --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       106
       +
                --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       107
        
                --arg boot_mode "${amiBootMode}" \

     

       108
        
                --arg root "$rootDisk" \

     

       109
        
                --arg boot "$bootDisk" \

     
···

       142
        
              ${pkgs.jq}/bin/jq -n \

     

       143
        
                --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       144
        
                --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       145
       +
                --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       146
        
                --arg boot_mode "${amiBootMode}" \

     

       147
        
                --arg file "$diskImage" \

     

       148
        
                 '{}

+1 -1

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

···

       85
        
               ${pkgs.jq}/bin/jq -n \

     

       86
        
                 --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       87
        
                 --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       88
       -
                 --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       89
        
                 --arg boot_mode "${imageBootMode}" \

     

       90
        
                 --arg root "$rootDisk" \

     

       91
        
                '{}

···

       85
        
               ${pkgs.jq}/bin/jq -n \

     

       86
        
                 --arg system_label ${lib.escapeShellArg config.system.nixos.label} \

     

       87
        
                 --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \

     

       88
       +
                 --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \

     

       89
        
                 --arg boot_mode "${imageBootMode}" \

     

       90
        
                 --arg root "$rootDisk" \

     

       91
        
                '{}

+1 -1

nixos/tests/systemd-repart.nix

···

       21
        
           shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name)

     

       22
        
       

     

       23
        
           subprocess.run([

     

       24
       -
             "${pkgs.qemu}/bin/qemu-img",

     

       25
        
             "resize",

     

       26
        
             "-f",

     

       27
        
             "raw",

···

       21
        
           shutil.copyfile("${machine.system.build.diskImage}/nixos.img", tmp_disk_image.name)

     

       22
        
       

     

       23
        
           subprocess.run([

     

       24
       +
             "${machine.config.virtualisation.qemu.package}/bin/qemu-img",

     

       25
        
             "resize",

     

       26
        
             "-f",

     

       27
        
             "raw",