hal/hald Makefile.am, 1.54, 1.55 hald_dbus.c, 1.58, 1.59 hald_runner.c, 1.6, 1.7

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory kemper:/tmp/cvs-serv6975/hald

Modified Files:
	Makefile.am hald_dbus.c hald_runner.c 
Log Message:
2006-05-04  David Zeuthen  <davidz at redhat.com>

	Patch from Joe Marcus Clarke <marcus at freebsd.org>. Move sockets to
	/var/run/hald and create this directoy on 'make install'

	* configure.in:
	* hald/Makefile.am:
	* hald/hald_dbus.c: (hald_dbus_local_server_init):
	* hald/hald_runner.c:



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am	25 Feb 2006 16:32:28 -0000	1.54
+++ Makefile.am	4 May 2006 19:40:16 -0000	1.55
@@ -81,6 +81,13 @@
 	&& (cmp -s xgen-gmc hald_marshal.c || cp xgen-gmc hald_marshal.c) \
 	&& rm -f xgen-gmc xgen-gmc~
 
+install-data-local:
+	-$(mkdir_p) $(HALD_SOCKET_DIR)
+	-chown $(HAL_USER):$(HAL_GROUP) $(HALD_SOCKET_DIR)
+	-chmod 0755 $(HALD_SOCKET_DIR)
+	-$(mkdir_p) $(HALD_SOCKET_DIR)/hald-local
+	-$(mkdir_p) $(HALD_SOCKET_DIR)/hald-runner
+
 clean-local:
 	rm -f *~
 	rm -f hald_marshal.c hald_marshal.h

Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- hald_dbus.c	5 Mar 2006 00:41:50 -0000	1.58
+++ hald_dbus.c	4 May 2006 19:40:16 -0000	1.59
@@ -48,6 +48,8 @@
 #include "util.h"
 #include "hald_runner.h"
 
+#define HALD_DBUS_ADDRESS "unix:tmpdir=" HALD_SOCKET_DIR
+
 static DBusConnection *dbus_connection = NULL;
 
 static void
@@ -3229,7 +3231,7 @@
 	 * connections for programs spawned by hald
 	 */
 	dbus_error_init (&error);
-	if ((local_server = dbus_server_listen ("unix:tmpdir=/tmp/hald-local", &error)) == NULL) { 
+	if ((local_server = dbus_server_listen (HALD_DBUS_ADDRESS, &error)) == NULL) { 
 		HAL_ERROR (("Cannot create D-BUS server"));
 		goto out;
 	}

Index: hald_runner.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_runner.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hald_runner.c	20 Feb 2006 02:24:27 -0000	1.6
+++ hald_runner.c	4 May 2006 19:40:16 -0000	1.7
@@ -46,7 +46,7 @@
   gpointer data2;
 } HelperData;
 
-#define DBUS_SERVER_ADDRESS "unix:tmpdir=/tmp/hald-runner" 
+#define DBUS_SERVER_ADDRESS "unix:tmpdir=" HALD_SOCKET_DIR
 
 static DBusConnection *runner_connection = NULL;