Author: eelco Date: 2010-06-14 07:39:13 +0000 (Mon, 14 Jun 2010) New Revision: 22251
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22251&view=rev Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix Log: * Hack to prevent the socat process from hanging the builder. Changes: Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-14 00:18:54 UTC (rev 22250) +++ nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-14 07:39:13 UTC (rev 22251) @@ -253,7 +253,7 @@ #! ${bash}/bin/sh diskImage=$diskImage TMPDIR=$TMPDIR - ${socat}/bin/socat unix-listen:$TMPDIR/samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' & + ${socat}/bin/socat unix-listen:$TMPDIR/samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' > /dev/null 2>&1 & while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly ${qemuCommand} EOF _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
