dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Urgh, if $TMPDIR is very long we run into the 108 character limit on

Browse Source 
Unix domain socket paths.  So use ./samba instead of $TMPDIR/samba.

svn path=/nixpkgs/trunk/; revision=22256
This commit is contained in:
Eelco Dolstra 2010-06-14 11:18:57 +00:00
parent b88adf69c3
commit b570419efa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/vm/default.nix
View File

@ -212,7 +212,7 @@ rec {
qemuCommandLinux = '' qemuCommandLinux = ''
qemu-system-x86_64 \ qemu-system-x86_64 \
-nographic -no-reboot \ -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 \ -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \
-kernel ${kernel}/bzImage \ -kernel ${kernel}/bzImage \
-initrd ${initrd}/initrd \ -initrd ${initrd}/initrd \
@ -253,8 +253,9 @@ rec {
#! ${bash}/bin/sh #! ${bash}/bin/sh
diskImage=$diskImage diskImage=$diskImage
TMPDIR=$TMPDIR 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 & cd $TMPDIR
while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly ${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} ${qemuCommand}
EOF EOF