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

* QEMU_SMBD_COMMAND is gone.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12719
This commit is contained in:
Eelco Dolstra 2008-08-26 11:39:10 +00:00
parent f69b6b4d49
commit 5b732a061f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ rec {
qemuCommandLinux = '' qemuCommandLinux = ''
QEMU_SMBD_COMMAND=${samba}/sbin/smbd qemu-system-x86_64 \ qemu-system-x86_64 \
-nographic -no-reboot \ -nographic -no-reboot \
-smb / -hda $diskImage \ -smb / -hda $diskImage \
-kernel ${kernel}/vmlinuz \ -kernel ${kernel}/vmlinuz \
@ -179,7 +179,7 @@ rec {
vmRunCommand = qemuCommand: writeText "vm-run" '' vmRunCommand = qemuCommand: writeText "vm-run" ''
export > saved-env export > saved-env
PATH=${coreutils}/bin:${kvm}/bin PATH=${coreutils}/bin:${kvm}/bin:${samba}/sbin
diskImage=''${diskImage:-/dev/null} diskImage=''${diskImage:-/dev/null}
@ -264,7 +264,7 @@ rec {
qemuCommandGeneric = '' qemuCommandGeneric = ''
QEMU_SMBD_COMMAND=${samba}/sbin/smbd qemu-system-x86_64 \ qemu-system-x86_64 \
-nographic -no-reboot \ -nographic -no-reboot \
-smb $(pwd) -hda $diskImage \ -smb $(pwd) -hda $diskImage \
$QEMU_OPTS $QEMU_OPTS