Attachment 213141 Details for Bug 221742 – path.patch

[patch] path.patch

path.patch (text/plain), 1.52 KB, created by Matthias Clasen on 2007-10-02 04:22:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2007-10-02 04:22:17 UTC

Size: 1.52 KB

patch

obsolete

>diff -up hal-0.5.10/hald/hald_runner.c.path hal-0.5.10/hald/hald_runner.c
>--- hal-0.5.10/hald/hald_runner.c.path	2007-10-02 00:19:14.000000000 -0400
>+++ hal-0.5.10/hald/hald_runner.c	2007-10-02 00:23:29.000000000 -0400
>@@ -265,22 +265,16 @@ hald_runner_start_runner (void)
> 						 NULL);
> 
> 
>-	argv[0] = "hald-runner";
> 	server_address = dbus_server_get_address (runner_server);
> 	env[0] = g_strdup_printf ("HALD_RUNNER_DBUS_ADDRESS=%s",
> 				  server_address);
>+	env[1] = NULL;
> 	dbus_free (server_address);
> 	hald_runner_path = g_getenv ("HALD_RUNNER_PATH");
> 	if (hald_runner_path != NULL) {
>-		env[1] =
>-		    g_strdup_printf ("PATH=%s:" PACKAGE_LIBEXEC_DIR ":"
>-				     PACKAGE_SCRIPT_DIR ":"
>-				     PACKAGE_BIN_DIR, hald_runner_path);
>+		argv[0] = g_strdup_printf ("%s/hald-runner", hald_runner_path);
> 	} else {
>-		env[1] =
>-		    g_strdup_printf ("PATH=" PACKAGE_LIBEXEC_DIR ":"
>-				     PACKAGE_SCRIPT_DIR ":"
>-				     PACKAGE_BIN_DIR);
>+		argv[0] = g_strdup_printf ("%s/hald-runner", PACKAGE_LIBEXEC_DIR);
> 	}
> 
> 	/*env[2] = "DBUS_VERBOSE=1"; */
>@@ -288,7 +282,7 @@ hald_runner_start_runner (void)
> 
> 	if (!g_spawn_async
> 	    (NULL, argv, env,
>-	     G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL,
>+	     G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
> 	     &runner_pid, &error)) {
> 		HAL_ERROR (("Could not spawn runner : '%s'",
> 			    error->message));
>@@ -296,7 +290,7 @@ hald_runner_start_runner (void)
> 		goto error;
> 	}
> 	g_free (env[0]);
>-	g_free (env[1]);
>+	g_free (argv[0]);
> 
> 	HAL_INFO (("Runner has pid %d", runner_pid));
>

Actions: View | Diff

Attachments on bug 221742: 213141