Author: eelco Date: 2010-06-14 11:18:57 +0000 (Mon, 14 Jun 2010) New Revision: 22256
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22256&view=rev Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix Log: * Urgh, if $TMPDIR is very long we run into the 108 character limit on Unix domain socket paths. So use ./samba instead of $TMPDIR/samba. Changes: Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-14 09:30:31 UTC (rev 22255) +++ nixpkgs/trunk/pkgs/build-support/vm/default.nix 2010-06-14 11:18:57 UTC (rev 22256) @@ -212,7 +212,7 @@ qemuCommandLinux = '' qemu-system-x86_64 \ -nographic -no-reboot \ - -net nic,model=virtio -chardev socket,id=samba,path=$TMPDIR/samba -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \ + -net nic,model=virtio -chardev socket,id=samba,path=./samba -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \ -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \ -kernel ${kernel}/bzImage \ -initrd ${initrd}/initrd \ @@ -253,8 +253,9 @@ #! ${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' > /dev/null 2>&1 & - while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly + cd $TMPDIR + ${socat}/bin/socat unix-listen:./samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' > /dev/null 2>&1 & + while [ ! -e ./samba ]; do sleep 0.1; done # ugly ${qemuCommand} EOF _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
