From 105d0e540befbdd32dfaa52d8faccdf26ea0b8c1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 19 Aug 2010 08:31:13 +0000
Subject: [PATCH] startSamba: reintroduce force user option set to current user

svn path=/nixpkgs/trunk/; revision=23242
---
 pkgs/build-support/vm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b9882914b26..ca0c5f38fb7 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -139,7 +139,7 @@ rec {
     mount -o bind /dev /fs/dev
 
     echo "mounting host filesystem..."
-    mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody
+    mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,sec=none
 
     mkdir -p /fs/nix/store
     mount -o bind /fs/hostfs/nix/store /fs/nix/store
@@ -227,6 +227,8 @@ rec {
 
   startSamba =
     ''
+      export WHO=`whoami`
+
       cat > $TMPDIR/smb.conf <<SMB
       [global]
         private dir = $TMPDIR
@@ -238,6 +240,7 @@ rec {
         smb passwd file = $TMPDIR/smbpasswd
         security = share
       [qemu]
+        force user = $WHO
         path = /
         read only = no
         guest ok = yes