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

* Doh.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22289
This commit is contained in:
Eelco Dolstra 2010-06-16 06:56:12 +00:00
parent 3218d7e6bc
commit 124f4dc7dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/vm/default.nix
View File

@ -286,7 +286,7 @@ rec {
createEmptyImage = {size, fullName}: '' createEmptyImage = {size, fullName}: ''
mkdir $out mkdir $out
diskImage=$out/disk-image.qcow2 diskImage=$out/disk-image.qcow2
qemu-img create -f qcow2 $diskImage "${toString size}M" ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
mkdir $out/nix-support mkdir $out/nix-support
echo "${fullName}" > $out/nix-support/full-name echo "${fullName}" > $out/nix-support/full-name
@ -373,7 +373,7 @@ rec {
diskImage=$(pwd)/disk-image.qcow2 diskImage=$(pwd)/disk-image.qcow2
origImage=${attrs.diskImage} origImage=${attrs.diskImage}
if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
qemu-img create -b "$origImage" -f qcow2 $diskImage ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
echo "$buildCommand" > cmd echo "$buildCommand" > cmd
@ -400,7 +400,7 @@ rec {
diskImage=$(pwd)/disk-image.qcow2 diskImage=$(pwd)/disk-image.qcow2
origImage=${attrs.diskImage} origImage=${attrs.diskImage}
if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
qemu-img create -b "$origImage" -f qcow2 $diskImage ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
''; '';
/* Inside the VM, run the stdenv setup script normally, but at the /* Inside the VM, run the stdenv setup script normally, but at the
@ -483,7 +483,7 @@ rec {
fi fi
diskImage="$1" diskImage="$1"
if ! test -e "$diskImage"; then if ! test -e "$diskImage"; then
qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
fi fi
export TMPDIR=$(mktemp -d) export TMPDIR=$(mktemp -d)
export out=/dummy export out=/dummy