Merge authors: Steve Langasek (vorlon) Related merge proposals: https://code.launchpad.net/~vorlon/upstart/lp.1235480/+merge/189434 proposed by: Steve Langasek (vorlon) review: Approve - Stéphane Graber (stgraber) ------------------------------------------------------------ revno: 1542 [merge] committer: Steve Langasek <[email protected]> branch nick: upstream timestamp: Fri 2013-10-04 14:50:13 -0700 message: Merge lp:~vorlon/upstart/lp.1235480 modified: ChangeLog extra/man/upstart-local-bridge.8 extra/upstart-local-bridge.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-10-04 12:33:07 +0000 +++ ChangeLog 2013-10-04 21:34:25 +0000 @@ -1,3 +1,8 @@ +2013-01-04 Steve Langasek <[email protected] + + * extra/upstart-local-bridge.c: use SOCKET_PATH in our event + environment, instead of clobbering PATH. (LP: #1235480) + 2013-10-04 James Hunt <[email protected]> * extra/upstart-local-bridge.c: === modified file 'extra/man/upstart-local-bridge.8' --- extra/man/upstart-local-bridge.8 2013-07-25 19:46:56 +0000 +++ extra/man/upstart-local-bridge.8 2013-10-04 21:44:38 +0000 @@ -70,7 +70,7 @@ CLIENT_PID=\fIPID\fP Process ID of connected client. .IP \(bu 4 -PATH=\fIPATH\fP +SOCKET_PATH=\fIPATH\fP .P .\" .SH EXAMPLES @@ -81,7 +81,7 @@ .RS .nf -foo SOCKET_TYPE=unix SOCKET_VARIANT=named PATH=/var/foo/bar name=value +foo SOCKET_TYPE=unix SOCKET_VARIANT=named SOCKET_PATH=/var/foo/bar name=value .fi .RE .IP "upstart\-local\-bridge \-\-event=bar \-\-path=@/var/foo/bar" 0.4i @@ -91,7 +91,7 @@ .RS .nf -bar SOCKET_TYPE=unix SOCKET_VARIANT=abstract PATH=@/var/foo/bar name=value +bar SOCKET_TYPE=unix SOCKET_VARIANT=abstract SOCKET_PATH=@/var/foo/bar name=value .fi .RE .\" === modified file 'extra/upstart-local-bridge.c' --- extra/upstart-local-bridge.c 2013-10-04 11:12:44 +0000 +++ extra/upstart-local-bridge.c 2013-10-04 21:34:25 +0000 @@ -824,7 +824,7 @@ var = NIH_MUST (nih_sprintf (NULL, "CLIENT_PID=%u", (unsigned int)client->ucred.pid)); NIH_MUST (nih_str_array_addp (&env, NULL, NULL, var)); - var = NIH_MUST (nih_sprintf (NULL, "PATH=%s", socket_path)); + var = NIH_MUST (nih_sprintf (NULL, "SOCKET_PATH=%s", socket_path)); NIH_MUST (nih_str_array_addp (&env, NULL, NULL, var)); /* Add the name=value pair */
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
