diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-26 11:39:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-26 11:39:10 +0000 |
| commit | 5b732a061fef557a2cf6b7c1ebfb61d3aa190beb (patch) | |
| tree | fb1ed102f061cb43fbd631f8be40c0fcc6d1b009 | |
| parent | f69b6b4d49cbeed2af1ea079abfb2bfa8a42e492 (diff) | |
| download | nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar.gz nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar.bz2 nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar.lz nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar.xz nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.tar.zst nixpkgs-5b732a061fef557a2cf6b7c1ebfb61d3aa190beb.zip | |
* QEMU_SMBD_COMMAND is gone.
svn path=/nixpkgs/trunk/; revision=12719
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index ab6b3911457..3f6969aa124 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 |