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

vmTools: omit '-drive ...' entirely instead of using /dev/null

Browse Source 
Fixes #33378.
This commit is contained in:
Will Dietz 2018-01-03 12:25:48 -06:00 committed by Tuomas Tynkkynen
parent 922bcd0e46
commit 21f7b2b3f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ rec {
-device virtio-rng-pci \ -device virtio-rng-pci \
-virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \
-virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -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} \ -kernel ${kernel}/${img} \
-initrd ${initrd}/initrd \ -initrd ${initrd}/initrd \
-append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
@ -223,8 +223,6 @@ rec {
mkdir xchg mkdir xchg
mv saved-env xchg/ mv saved-env xchg/
diskImage=''${diskImage:-/dev/null}
eval "$preVM" eval "$preVM"
if [ "$enableParallelBuilding" = 1 ]; then if [ "$enableParallelBuilding" = 1 ]; then
@ -240,7 +238,7 @@ rec {
# the -K option to preserve the temporary build directory). # the -K option to preserve the temporary build directory).
cat > ./run-vm <<EOF cat > ./run-vm <<EOF
#! ${bash}/bin/sh #! ${bash}/bin/sh
diskImage=$diskImage ''${diskImage:+diskImage=$diskImage}
TMPDIR=$TMPDIR TMPDIR=$TMPDIR
cd $TMPDIR cd $TMPDIR
${qemuCommand} ${qemuCommand}