From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FeiQ5-0000XT-F0
	for qemu-devel@nongnu.org; Fri, 12 May 2006 20:55:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FeiQ4-0000X4-6R
	for Qemu-devel@nongnu.org; Fri, 12 May 2006 20:55:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FeiQ3-0000X1-Vn
	for Qemu-devel@nongnu.org; Fri, 12 May 2006 20:55:44 -0400
Received: from [68.230.240.35] (helo=eastrmmtao04.cox.net)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FeiRu-0003jw-Ji
	for Qemu-devel@nongnu.org; Fri, 12 May 2006 20:57:38 -0400
Received: from eastrmwml06.mgt.cox.net ([172.18.52.67]) by eastrmmtao04.cox.net
	(InterMail vM.6.01.06.01 201-2131-130-101-20060113) with ESMTP id
	<20060513005542.GSKS9931.eastrmmtao04.cox.net@eastrmwml06.mgt.cox.net>
	for <Qemu-devel@nongnu.org>; Fri, 12 May 2006 20:55:42 -0400
Message-ID: <31331193.1147481742835.JavaMail.root@eastrmwml06.mgt.cox.net>
Date: Fri, 12 May 2006 20:55:42 -0400
From: Ben Taylor <sol10x86@cox.net>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_Part_47065_30938942.1147481742768"
Subject: [Qemu-devel] PATCH: enable samba for Solaris
Reply-To: sol10x86@cox.net, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Qemu-devel@nongnu.org

------=_Part_47065_30938942.1147481742768
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


This patch is to allow the onboard samba configuration in qemu to correctly start
the samba server on Solaris (It's in a different location than a normal linux system).

Ben
------=_Part_47065_30938942.1147481742768
Content-Type: text/x-patch; name=qemu-solaris-smb.patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=qemu-solaris-smb.patch

diff -ruN qemu-orig/vl.c qemu/vl.c
--- qemu-orig/vl.c	2006-05-03 18:02:44.000000000 -0400
+++ qemu/vl.c	2006-05-12 20:48:32.642704000 -0400
@@ -2496,8 +2496,13 @@
     fclose(f);
     atexit(smb_exit);
 
+#ifdef HOST_SOLARIS
+    snprintf(smb_cmdline, sizeof(smb_cmdline), "/bin/env LC_ALL=C /usr/sfw/sbin/smbd -s %s",
+             smb_conf);
+#else
     snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s",
              smb_conf);
+#endif
     
     slirp_add_exec(0, smb_cmdline, 4, 139);
 }

------=_Part_47065_30938942.1147481742768--