Merge authors: Dmitrijs Ledkovs (xnox) ------------------------------------------------------------ revno: 1546 [merge] committer: Steve Langasek <[email protected]> branch nick: upstream timestamp: Wed 2013-10-23 15:44:54 -0700 message: Merge lp:~xnox/upstart/fix-socket-bridge-path modified: ChangeLog extra/man/socket-event.7 extra/upstart-socket-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-23 18:00:46 +0000 +++ ChangeLog 2013-10-23 22:44:54 +0000 @@ -1,3 +1,8 @@ +2013-10-23 Dmitrijs Ledkovs <[email protected]> + + * extra/upstart-socket-bridge.c: use SOCKET_PATH in our event + environment, instead of clobbering PATH. (LP: #1235480) + 2013-10-23 James Hunt <[email protected]> * util/initctl.h: IS_INIT_EVENT(): Ignore session end event when === modified file 'extra/man/socket-event.7' --- extra/man/socket-event.7 2013-03-25 12:45:31 +0000 +++ extra/man/socket-event.7 2013-10-23 16:33:09 +0000 @@ -11,7 +11,7 @@ .B socket .BI PROTO\fR= PROTO -.BI PATH\fR= PATH +.BI SOCKET_PATH\fR= PATH .\" .SH DESCRIPTION === modified file 'extra/upstart-socket-bridge.c' --- extra/upstart-socket-bridge.c 2011-05-15 14:21:17 +0000 +++ extra/upstart-socket-bridge.c 2013-10-23 16:33:09 +0000 @@ -326,7 +326,7 @@ NIH_MUST (nih_str_array_add (&env, NULL, &env_len, "PROTO=unix")); - var = NIH_MUST (nih_sprintf (NULL, "PATH=%s", + var = NIH_MUST (nih_sprintf (NULL, "SOCKET_PATH=%s", sock->sun_addr.sun_path)); NIH_MUST (nih_str_array_addp (&env, NULL, &env_len, var));
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
