From 5b732a061fef557a2cf6b7c1ebfb61d3aa190beb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Aug 2008 11:39:10 +0000
Subject: [PATCH] * QEMU_SMBD_COMMAND is gone.
svn path=/nixpkgs/trunk/; revision=12719
---
pkgs/build-support/vm/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index ab6b39114573..3f6969aa124b 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -166,7 +166,7 @@ rec {
qemuCommandLinux = ''
- QEMU_SMBD_COMMAND=${samba}/sbin/smbd qemu-system-x86_64 \
+ qemu-system-x86_64 \
-nographic -no-reboot \
-smb / -hda $diskImage \
-kernel ${kernel}/vmlinuz \
@@ -179,7 +179,7 @@ rec {
vmRunCommand = qemuCommand: writeText "vm-run" ''
export > saved-env
- PATH=${coreutils}/bin:${kvm}/bin
+ PATH=${coreutils}/bin:${kvm}/bin:${samba}/sbin
diskImage=''${diskImage:-/dev/null}
@@ -264,7 +264,7 @@ rec {
qemuCommandGeneric = ''
- QEMU_SMBD_COMMAND=${samba}/sbin/smbd qemu-system-x86_64 \
+ qemu-system-x86_64 \
-nographic -no-reboot \
-smb $(pwd) -hda $diskImage \
$QEMU_OPTS