diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
| commit | 5837d1a0704779928487687ada02cecbdf5b4603 (patch) | |
| tree | 4d5971e50c2a24ff3eac39e2e67e303af3daee97 /pkgs/build-support | |
| parent | bfb1db7a751879c83eabe823b767a71924a45bc5 (diff) | |
| parent | ad26bfd316d03236181774a0245ab874703e24bd (diff) | |
| download | nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.gz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.bz2 nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.lz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.xz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.zst nixlib-5837d1a0704779928487687ada02cecbdf5b4603.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e31f513c6666..64f4a759e1be 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -208,7 +208,7 @@ rec { -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ + ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ @@ -223,8 +223,6 @@ rec { mkdir xchg mv saved-env xchg/ - diskImage=''${diskImage:-/dev/null} - eval "$preVM" if [ "$enableParallelBuilding" = 1 ]; then @@ -240,7 +238,7 @@ rec { # the -K option to preserve the temporary build directory). cat > ./run-vm <<EOF #! ${bash}/bin/sh - diskImage=$diskImage + ''${diskImage:+diskImage=$diskImage} TMPDIR=$TMPDIR cd $TMPDIR ${qemuCommand} |