From 88a5d8915a4ef6af7d5260b6969e9d0331bf8217 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jun 2010 00:18:54 +0000 Subject: [PATCH] * Support repeated mounting of the CIFS share. Necessary because the mount tends to timeout if the host is heavily loaded. svn path=/nixpkgs/trunk/; revision=22250 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8fef75e357a7..d78e9d7e8839 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -220,7 +220,7 @@ rec { $QEMU_OPTS ''; - + vmRunCommand = qemuCommand: writeText "vm-run" '' export > saved-env @@ -253,7 +253,7 @@ rec { #! ${bash}/bin/sh diskImage=$diskImage TMPDIR=$TMPDIR - ${socat}/bin/socat unix-listen:$TMPDIR/samba exec:'${samba}/sbin/smbd -s $TMPDIR/smb.conf' & + ${socat}/bin/socat unix-listen:$TMPDIR/samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' & while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly ${qemuCommand} EOF